From d2b6efddb3778c259d042db74ff43324ea5f1c13 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 2 Dec 2012 00:25:11 +0000 Subject: [PATCH] Added patch from Henry Renamed gpg to pgp git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5926 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/GenCertDialog.cpp | 8 +- retroshare-gui/src/gui/Identity/IdDialog.ui | 8 +- .../src/gui/Identity/IdEditDialog.ui | 10 +- retroshare-gui/src/gui/NetworkDialog.ui | 4 +- .../src/gui/connect/ConfCertDialog.ui | 8 +- .../src/gui/connect/ConnectFriendWizard.ui | 4 +- retroshare-gui/src/gui/settings/ServerPage.ui | 2 +- retroshare-gui/src/lang/retroshare_en.ts | 239 +++++++++++------- 8 files changed, 173 insertions(+), 110 deletions(-) diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index e843ca098..3789ac38f 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -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(); diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index fd949cbbf..52f3b6246 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -253,7 +253,7 @@ - GPG Name + PGP Name @@ -270,7 +270,7 @@ - GPG Email + PGP Email @@ -307,14 +307,14 @@ - GPG Id + PGP Id - GPG Hash + PGP Hash diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui index 310b8c2bf..6961d5c17 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui @@ -36,7 +36,7 @@ - GPG Name + PGP Name @@ -46,7 +46,7 @@ - GPG Email + PGP Email @@ -72,7 +72,7 @@ - GPG Hash + PGP Hash @@ -82,7 +82,7 @@ - GPG Id + PGP Id @@ -115,7 +115,7 @@ - Gpg Associated ID + PGP Associated ID diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index 2c78b545d..77d03b56a 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -110,7 +110,7 @@ Did I authenticated peer - Did I sign his gpg key + Did I sign his PGP key @@ -180,7 +180,7 @@ - Show keys that are not validated by the GPG web of trust + Show keys that are not validated by the PGP web of trust diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index 38a330cd7..0934b54e0 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -504,7 +504,7 @@ - GPG Key + PGP Key false @@ -522,7 +522,7 @@ - Peer has signed my GPG key + Peer has signed my PGP key @@ -578,7 +578,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;">Signing a key cannot be undone, so do it wisely.</p></body></html> - Sign GPG key + Sign PGP key @@ -607,7 +607,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;">Signing a key cannot be undone, so do it wisely.</p></body></html> - Sign GPG key + Sign PGP key diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui index 6b9cf5947..5935f4446 100644 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui @@ -664,7 +664,7 @@ - Authenticate friend (Sign GPG Key) + Authenticate friend (Sign PGP Key) @@ -866,7 +866,7 @@ - Authenticate friend (Sign GPG Key) + Authenticate friend (Sign PGP Key) diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index f4ecd9966..a0e82daf5 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -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 diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index 7d78ff62d..ff0e34697 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -1473,14 +1473,6 @@ Please choose one of it to chat with. Full - - GPG Key - - - - Peer has signed my GPG key - - Show Help for Trust Settings and Signing @@ -1499,10 +1491,6 @@ 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;">Signing a key cannot be undone, so do it wisely.</p></body></html> - - Sign GPG key - - Deny Friend @@ -1584,6 +1572,66 @@ p, li { white-space: pre-wrap; } Peer has not authenticated me as a friend and did not sign my PGP key + + PGP Key + + + + Peer has signed my PGP key + + + + Sign PGP key + + + + Services + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">User service permissions</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This tab allows you to finely tune which services each of your contacts is allowed to use with you.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Some services (Discovery, anonymous routing) can be switched off globally, which always overrides the settings per-user.</p></body></html> + + + + <html><head/><body><p>Disabling anonymous routing will suppress all sending/retrieval of tunnel and anonymous search requests from/to this user. This user will not be able to transfer anonymously through you.</p><p>For a global switch, go to the server configuration panel.</p></body></html> + + + + Anonymous routing + + + + <html><head/><body><p>Disabling discovery removes the sending of public keys of your own friends to this user. Discovery information from this friend will be dropped as well.</p><p>For a global switch, go to the server configuration panel.</p></body></html> + + + + Discovery + + + + <html><head/><body><p>Disabling this means that forums and channels posts will not be passed from you to this friend, and items coming from this friend will be dropped.</p></body></html> + + + + Forums/Channels + + + + Chat + + + + PushButton + + ConnectFriendWizard @@ -1779,10 +1827,6 @@ p, li { white-space: pre-wrap; } Add friend to group: - - Authenticate friend (Sign GPG Key) - - Add as friend to connect with @@ -1956,6 +2000,26 @@ p, li { white-space: pre-wrap; } Cannot get peer details of PGP key %1 + + Authenticate friend (Sign PGP Key) + + + + Service permissions + + + + Anonymous routing + + + + Discovery + + + + Forums/channels + + CreateBlog @@ -2473,11 +2537,10 @@ Do you want to save your changes? <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-size:8pt;"> You can set your Thumbnail Image for your Channel Post.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-size:8pt;"> You can use Drag and Drop to Attach Files.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-size:8pt;"> Set your Subject and Description for your Channel Post.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-size:8pt;"> You can View your Attached Files on Attachments Tab.</span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">Attachments:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Use Drag and Drop / Add Files button, to Hash new files.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/feedback_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Copy/Paste RetroShare links from your shares</span></p></body></html> @@ -4997,10 +5060,6 @@ p, li { white-space: pre-wrap; } Create a new Location - - Generate GPG key Failure - - Location field is required with a minimum of 3 characters @@ -5009,12 +5068,6 @@ p, li { white-space: pre-wrap; } All fields are required with a minimum of 3 characters - - Generating new GPG key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. - -Fill in your GPG password when asked, to sign your new key. - - Generate ID Failure @@ -5115,10 +5168,6 @@ and use the import button to load it You can create a new identity with this form. - - You can use an existing identity (i.e. a gpg key pair), from the list below, or create a new one with this form. - - Failed to Generate your new Certificate, maybe PGP password is wrong! @@ -5169,6 +5218,20 @@ anonymous, you can use a fake email. RetroShare uses PGP keys for identity management. + + You can use an existing identity (i.e. a PGP key pair), from the list below, or create a new one with this form. + + + + Generate PGP key Failure + + + + Generating new PGP key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. + +Fill in your PGP password when asked, to sign your new key. + + GeneralPage @@ -5964,22 +6027,6 @@ p, li { white-space: pre-wrap; } Key ID - - GPG Name - - - - GPG Email - - - - GPG Id - - - - GPG Hash - - Reputation @@ -5992,6 +6039,22 @@ p, li { white-space: pre-wrap; } Overall Rating + + PGP Name + + + + PGP Email + + + + PGP Id + + + + PGP Hash + + IdEditDialog @@ -6003,22 +6066,6 @@ p, li { white-space: pre-wrap; } Key ID - - GPG Name - - - - GPG Email - - - - GPG Hash - - - - GPG Id - - New Identity @@ -6036,7 +6083,23 @@ p, li { white-space: pre-wrap; } - Gpg Associated ID + PGP Name + + + + PGP Email + + + + PGP Hash + + + + PGP Id + + + + PGP Associated ID @@ -7420,10 +7483,6 @@ Do you want to save message ? Did I authenticated peer - - Did I sign his gpg key - - Did peer authenticated me @@ -7440,10 +7499,6 @@ Do you want to save message ? Peer ID - - Show keys that are not validated by the GPG web of trust - - Network Status @@ -7585,6 +7640,14 @@ Right-click and select 'make friend' to be able to connect. PGP key signed by you + + Did I sign his PGP key + + + + Show keys that are not validated by the PGP web of trust + + NetworkPage @@ -10009,18 +10072,6 @@ Reducing image to %1x%2 pixels? Firewalled - - The DHT allows you to answer connection -requests from your friends using BitTorrent's DHT. -It greatly improves the connectivity. - -The Discovery service sends locations and GPG -identities of your trusted contacts to connected -peers, to help them choose new friends. -The friendship is never automatic however, and both -peers still need to trust each other to allow connection. - - Public: DHT & Discovery @@ -10149,6 +10200,18 @@ p, li { white-space: pre-wrap; } Max. tunnel requests forwarded per second: + + The DHT allows you to answer connection +requests from your friends using BitTorrent's DHT. +It greatly improves the connectivity. + +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 +peers still need to trust each other to allow connection. + + Settings