Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-28 11:30:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added patch from Henry

Browse source 
Renamed gpg to pgp

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-02 00:25:11 +00:00
parent e3da77612a
commit d2b6efddb3
8 changed files with 173 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/GenCertDialog.cpp
View file

@ -106,7 +106,7 @@ void GenCertDialog::init()
ui.label->hide();
text += tr("You can create a new identity with this form.");
} else {
text += tr("You can use an existing identity (i.e. a gpg key pair), from the list below, or create a new one with this form.");
text += tr("You can use an existing identity (i.e. a PGP key pair), from the list below, or create a new one with this form.");
}
ui.headerLabel2->setText(text);
@ -203,7 +203,7 @@ void GenCertDialog::genPerson()
if (genLoc.length() < 3) {
/* Message Dialog */
QMessageBox::warning(this,
tr("Generate GPG key Failure"),
tr("Generate PGP key Failure"),
tr("Location field is required with a minimum of 3 characters"),
QMessageBox::Ok);
return;
@ -225,14 +225,14 @@ void GenCertDialog::genPerson()
ui.email_input->text().length() < 3 || genLoc.length() < 3) {
/* Message Dialog */
QMessageBox::warning(this,
tr("Generate GPG key Failure"),
tr("Generate PGP key Failure"),
tr("All fields are required with a minimum of 3 characters"),
QMessageBox::Ok);
return;
}
//generate a new gpg key
std::string err_string;
ui.no_gpg_key_label->setText(tr("Generating new GPG key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. \n\nFill in your GPG password when asked, to sign your new key."));
ui.no_gpg_key_label->setText(tr("Generating new PGP key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. \n\nFill in your PGP password when asked, to sign your new key."));
ui.no_gpg_key_label->show();
ui.new_gpg_key_checkbox->hide();
ui.name_label->hide();

8
retroshare-gui/src/gui/Identity/IdDialog.ui
View file

@ -253,7 +253,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>GPG Name</string>
<string>PGP Name</string>
</property>
</widget>
</item>
@ -270,7 +270,7 @@
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>GPG Email</string>
<string>PGP Email</string>
</property>
</widget>
</item>
@ -307,14 +307,14 @@
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>GPG Id</string>
<string>PGP Id</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>GPG Hash</string>
<string>PGP Hash</string>
</property>
</widget>
</item>

10
retroshare-gui/src/gui/Identity/IdEditDialog.ui
View file

@ -36,7 +36,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>GPG Name</string>
<string>PGP Name</string>
</property>
</widget>
</item>
@ -46,7 +46,7 @@
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>GPG Email</string>
<string>PGP Email</string>
</property>
</widget>
</item>
@ -72,7 +72,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>GPG Hash</string>
<string>PGP Hash</string>
</property>
</widget>
</item>
@ -82,7 +82,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>GPG Id</string>
<string>PGP Id</string>
</property>
</widget>
</item>
@ -115,7 +115,7 @@
<item>
<widget class="QRadioButton" name="radioButton_GpgId">
<property name="text">
<string>Gpg Associated ID</string>
<string>PGP Associated ID</string>
</property>
</widget>
</item>

4
retroshare-gui/src/gui/NetworkDialog.ui
View file

@ -110,7 +110,7 @@
<string>Did I authenticated peer</string>
</property>
<property name="toolTip">
<string>Did I sign his gpg key</string>
<string>Did I sign his PGP key</string>
</property>
</column>
<column>
@ -180,7 +180,7 @@
<item>
<widget class="QCheckBox" name="showUnvalidKeys">
<property name="text">
<string>Show keys that are not validated by the GPG web of trust</string>
<string>Show keys that are not validated by the PGP web of trust</string>
</property>
</widget>
</item>

8
retroshare-gui/src/gui/connect/ConfCertDialog.ui
View file

@ -504,7 +504,7 @@
</font>
</property>
<property name="title">
<string>GPG Key</string>
<string>PGP Key</string>
</property>
<property name="flat">
<bool>false</bool>
@ -522,7 +522,7 @@
</font>
</property>
<property name="text">
<string>Peer has signed my GPG key</string>
<string>Peer has signed my PGP key</string>
</property>
</widget>
</item>
@ -578,7 +578,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;Signing a key cannot be undone, so do it wisely.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Sign GPG key</string>
<string>Sign PGP key</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
@ -607,7 +607,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;Signing a key cannot be undone, so do it wisely.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Sign GPG key</string>
<string>Sign PGP key</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">

4
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View file

@ -664,7 +664,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="fr_signGPGCheckBox">
<property name="text">
<string>Authenticate friend (Sign GPG Key)</string>
<string>Authenticate friend (Sign PGP Key)</string>
</property>
</widget>
</item>
@ -866,7 +866,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="signGPGCheckBox">
<property name="text">
<string>Authenticate friend (Sign GPG Key)</string>
<string>Authenticate friend (Sign PGP Key)</string>
</property>
</widget>
</item>

2
retroshare-gui/src/gui/settings/ServerPage.ui
View file

@ -76,7 +76,7 @@
requests from your friends using BitTorrent's DHT.
It greatly improves the connectivity.
The Discovery service sends locations and GPG
The Discovery service sends locations and PGP
identities of your trusted contacts to connected
peers, to help them choose new friends.
The friendship is never automatic however, and both