removed some mentions to PGP

retroshare-gui/src/gui/FriendsDialog.h

@@ -57,7 +57,7 @@ public:
     ~FriendsDialog ();
 
     virtual QIcon iconPixmap() const { return QIcon(IMAGE_NETWORK) ; } //MainPage
-    virtual QString pageName() const { return tr("Friends") ; } //MainPage
+    virtual QString pageName() const { return tr("Trusted nodes") ; } //MainPage
     virtual QString helpText() const { return ""; } //MainPage
 
     virtual UserNotify *getUserNotify(QObject *parent);

retroshare-gui/src/gui/connect/ConfCertDialog.cpp

@@ -287,7 +287,7 @@ void ConfCertDialog::loadInvitePage()
     //infotext += tr("<p>Use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
     infotext += tr("<p>This certificate contains:") ;
     infotext += "<UL>" ;
-    infotext += "<li> a <b>PGP public key</b>";
+    infotext += "<li> a <b>Profile key</b>";
     infotext += " (" + QString::fromUtf8(detail.name.c_str())  + "@" + detail.gpg_id.toStdString().c_str()+") " ;
     if(ui._shouldAddSignatures_CB->isChecked())
         infotext += tr("with")+" "+QString::number(detail.gpgSigners.size()-1)+" "+tr("external signatures</li>") ;

retroshare-gui/src/gui/connect/ConfCertDialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>722</width>
-    <height>546</height>
+    <height>651</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -69,7 +69,7 @@
       <item row="0" column="0">
        <widget class="QTabWidget" name="stabWidget">
         <property name="currentIndex">
-         <number>0</number>
+         <number>1</number>
         </property>
         <widget class="QWidget" name="tab">
          <attribute name="icon">
@@ -270,13 +270,13 @@
            <normaloff>:/images/kcmsystem24.png</normaloff>:/images/kcmsystem24.png</iconset>
          </attribute>
          <attribute name="title">
-          <string>Advanced</string>
+          <string>Connectivity</string>
          </attribute>
          <layout class="QGridLayout" name="gridLayout_15">
           <item row="0" column="0">
            <widget class="QTabWidget" name="tabWidget">
             <property name="currentIndex">
-             <number>0</number>
+             <number>1</number>
             </property>
             <widget class="QWidget" name="tab_5">
              <attribute name="title">
@@ -424,51 +424,44 @@
               </item>
              </layout>
             </widget>
-            <widget class="QWidget" name="tab_2">
-             <attribute name="title">
-              <string>Retroshare Certificate</string>
-             </attribute>
-             <layout class="QGridLayout" name="gridLayout">
-              <item row="0" column="0">
-               <widget class="QLabel" name="label">
-                <property name="text">
-                 <string>Use this certificate to make friends:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QTextEdit" name="userCertificateText"/>
-              </item>
-              <item row="2" column="0">
-               <layout class="QHBoxLayout" name="horizontalLayout">
-                <item>
-                 <widget class="QCheckBox" name="_shouldAddSignatures_CB">
-                  <property name="text">
-                   <string>Include signatures</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="horizontalSpacer_2">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
            </widget>
           </item>
          </layout>
         </widget>
+        <widget class="QWidget" name="tab_4">
+         <attribute name="title">
+          <string>Retroshare Certificate</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QTextEdit" name="userCertificateText"/>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QCheckBox" name="_shouldAddSignatures_CB">
+              <property name="text">
+               <string>Include signatures</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
        </widget>
       </item>
      </layout>

retroshare-gui/src/gui/connect/ConnectFriendWizard.ui

@@ -333,7 +333,7 @@
           </font>
          </property>
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend's Retroshare certificate. WARNING: this is different from your friend's PGP key. Do not paste your friend's PGP key here (not even a part of it). It's not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend's Retroshare certificate. WARNING: this is different from your friend's profile key. Do not paste your friend's profile key here (not even a part of it). It's not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="styleSheet">
           <string notr="true"/>

retroshare-gui/src/gui/connect/PGPKeyDialog.cpp

@@ -75,7 +75,7 @@ PGPKeyDialog::PGPKeyDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidget *p
 //	 }
 
 	ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo64.png"));
-    ui.headerFrame->setHeaderText(tr("PGP Key details"));
+    ui.headerFrame->setHeaderText(tr("Retroshare profile"));
 
     //ui._chat_CB->hide() ;
 

retroshare-gui/src/gui/connect/PGPKeyDialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>990</width>
+    <width>1071</width>
-    <height>668</height>
+    <height>718</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,11 +27,11 @@
    <item>
     <widget class="QTabWidget" name="stabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
-       <string>PGP Key info</string>
+       <string>Profile info</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
@@ -41,7 +41,7 @@
            <item row="0" column="0">
             <widget class="QLabel" name="label_name">
              <property name="text">
-              <string>PGP name :</string>
+              <string>Name :</string>
              </property>
             </widget>
            </item>
@@ -153,7 +153,7 @@
           </font>
          </property>
          <property name="text">
-          <string>This key has signed your own PGP key</string>
+          <string>This profile has signed your own profile key</string>
          </property>
         </widget>
        </item>
@@ -197,7 +197,7 @@ p, li { white-space: pre-wrap; }
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
-            <string>Sign this PGP key</string>
+            <string>Sign this key</string>
            </property>
            <property name="icon">
             <iconset resource="../images.qrc">
@@ -301,13 +301,13 @@ p, li { white-space: pre-wrap; }
      </widget>
      <widget class="QWidget" name="widget">
       <attribute name="title">
-       <string>ASCII format</string>
+       <string>PGP key</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QLabel" name="label_4">
          <property name="text">
-          <string>Below is the node's PGP key. It identifies the node and all its locations. A &quot;Retroshare certificate&quot; that you can exchange in order to make friends, is in the the &quot;details&quot; of each separate location.</string>
+          <string>Below is the node's profile key in PGP ascii format. It identifies all nodes of the same profile. A &quot;Retroshare certificate&quot; that you can exchange in order to make friends, is in the the &quot;details&quot; of each separate node.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -348,7 +348,7 @@ p, li { white-space: pre-wrap; }
        <item>
         <widget class="QLabel" name="label_3">
          <property name="text">
-          <string>These options apply to all locations of the same node:</string>
+          <string>These options apply to all nodes of the profile:</string>
          </property>
         </widget>
        </item>