Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-09 17:45:15 -04: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();