diff --git a/retroshare-gui/src/gui/FriendsDialog.h b/retroshare-gui/src/gui/FriendsDialog.h
index d37e395a7..6b464c130 100644
--- a/retroshare-gui/src/gui/FriendsDialog.h
+++ b/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);
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
index 9dba69c27..958b2be54 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@@ -287,7 +287,7 @@ void ConfCertDialog::loadInvitePage()
//infotext += tr("Use this certificate to make new friends. Send it by email, or give it hand to hand.
") ;
infotext += tr("This certificate contains:") ;
infotext += "
" ;
- infotext += "- a PGP public key";
+ infotext += "
- a Profile key";
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
") ;
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
index 66724a7a7..469bae218 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
@@ -7,7 +7,7 @@
0
0
722
- 546
+ 651
@@ -69,7 +69,7 @@
-
- 0
+ 1
@@ -270,13 +270,13 @@
:/images/kcmsystem24.png:/images/kcmsystem24.png
- Advanced
+ Connectivity
-
- 0
+ 1
@@ -424,51 +424,44 @@
-
-
- Retroshare Certificate
-
-
- -
-
-
- Use this certificate to make friends:
-
-
-
- -
-
-
- -
-
-
-
-
-
- Include signatures
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
+
+
+ Retroshare Certificate
+
+
+ -
+
+
+ -
+
+
-
+
+
+ Include signatures
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
index dbe8220b1..cea2104de 100644
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
@@ -333,7 +333,7 @@
- <html><head/><body><p>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.</p></body></html>
+ <html><head/><body><p>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.</p></body></html>
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
index 310ff55c8..d99300706 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
+++ b/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() ;
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
index 0d34ca4bb..065575e7e 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
@@ -6,8 +6,8 @@
0
0
- 990
- 668
+ 1071
+ 718
@@ -27,11 +27,11 @@
-
- 0
+ 1
- PGP Key info
+ Profile info
-
@@ -41,7 +41,7 @@
-
- PGP name :
+ Name :
@@ -153,7 +153,7 @@
- This key has signed your own PGP key
+ This profile has signed your own profile key
@@ -197,7 +197,7 @@ p, li { white-space: pre-wrap; }
<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">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.</span></p></body></html>
- Sign this PGP key
+ Sign this key
@@ -301,13 +301,13 @@ p, li { white-space: pre-wrap; }
- ASCII format
+ PGP key
-
- Below is the node's PGP key. It identifies the node and all its locations. A "Retroshare certificate" that you can exchange in order to make friends, is in the the "details" of each separate location.
+ Below is the node's profile key in PGP ascii format. It identifies all nodes of the same profile. A "Retroshare certificate" that you can exchange in order to make friends, is in the the "details" of each separate node.
true
@@ -348,7 +348,7 @@ p, li { white-space: pre-wrap; }
-
- These options apply to all locations of the same node:
+ These options apply to all nodes of the profile: