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
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

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();

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>

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>

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>

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">

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>

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

View File

@ -1473,14 +1473,6 @@ Please choose one of it to chat with.</source>
<source>Full </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Peer has signed my GPG key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Help for Trust Settings and Signing</source>
<translation type="unfinished"></translation>
@ -1499,10 +1491,6 @@ 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;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sign GPG key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Deny Friend</source>
<translation type="unfinished"></translation>
@ -1584,6 +1572,66 @@ p, li { white-space: pre-wrap; }
<source>Peer has not authenticated me as a friend and did not sign my PGP key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Peer has signed my PGP key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sign PGP key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p 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-weight:600;&quot;&gt;User service permissions&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This tab allows you to finely tune which services each of your contacts is allowed to use with you.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Some services (Discovery, anonymous routing) can be switched off globally, which always overrides the settings per-user.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;For a global switch, go to the server configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Anonymous routing</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;For a global switch, go to the server configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Discovery</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forums/Channels</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Chat</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PushButton</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ConnectFriendWizard</name>
@ -1779,10 +1827,6 @@ p, li { white-space: pre-wrap; }
<source>Add friend to group:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Authenticate friend (Sign GPG Key)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add as friend to connect with</source>
<translation type="unfinished"></translation>
@ -1956,6 +2000,26 @@ p, li { white-space: pre-wrap; }
<source>Cannot get peer details of PGP key %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Authenticate friend (Sign PGP Key)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Service permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Anonymous routing</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Discovery</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Forums/channels</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateBlog</name>
@ -2473,11 +2537,10 @@ Do you want to save your changes?</source>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; You can set your Thumbnail Image for your Channel Post.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; You can use Drag and Drop to Attach Files.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; Set your Subject and Description for your Channel Post.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; You can View your Attached Files on Attachments Tab.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p 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-family:&apos;MS Shell Dlg 2&apos;; font-size:10pt; font-weight:600;&quot;&gt;Attachments:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Use Drag and Drop / Add Files button, to Hash new files.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copy/Paste RetroShare links from your shares&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -4997,10 +5060,6 @@ p, li { white-space: pre-wrap; }
<source>Create a new Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate GPG key Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Location field is required with a minimum of 3 characters</source>
<translation type="unfinished"></translation>
@ -5009,12 +5068,6 @@ p, li { white-space: pre-wrap; }
<source>All fields are required with a minimum of 3 characters</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate ID Failure</source>
<translation type="unfinished"></translation>
@ -5115,10 +5168,6 @@ and use the import button to load it</source>
<source>You can create a new identity with this form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can use an existing identity (i.e. a gpg key pair), from the list below, or create a new one with this form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to Generate your new Certificate, maybe PGP password is wrong!</source>
<translation type="unfinished"></translation>
@ -5169,6 +5218,20 @@ anonymous, you can use a fake email.</source>
<source>RetroShare uses PGP keys for identity management.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can use an existing identity (i.e. a PGP key pair), from the list below, or create a new one with this form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate PGP key Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GeneralPage</name>
@ -5964,22 +6027,6 @@ p, li { white-space: pre-wrap; }
<source>Key ID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Email</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Id</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Hash</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reputation</source>
<translation type="unfinished"></translation>
@ -5992,6 +6039,22 @@ p, li { white-space: pre-wrap; }
<source>Overall Rating</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Email</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Id</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Hash</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>IdEditDialog</name>
@ -6003,22 +6066,6 @@ p, li { white-space: pre-wrap; }
<source>Key ID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Email</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Hash</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG Id</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New Identity</source>
<translation type="unfinished"></translation>
@ -6036,7 +6083,23 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<source>Gpg Associated ID</source>
<source>PGP Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Email</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Hash</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Id</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP Associated ID</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -7420,10 +7483,6 @@ Do you want to save message ?</source>
<source>Did I authenticated peer</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Did I sign his gpg key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Did peer authenticated me</source>
<translation type="unfinished"></translation>
@ -7440,10 +7499,6 @@ Do you want to save message ?</source>
<source>Peer ID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show keys that are not validated by the GPG web of trust</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Network Status</source>
<translation type="unfinished"></translation>
@ -7585,6 +7640,14 @@ Right-click and select &apos;make friend&apos; to be able to connect.</source>
<source>PGP key signed by you</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Did I sign his PGP key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show keys that are not validated by the PGP web of trust</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NetworkPage</name>
@ -10009,18 +10072,6 @@ Reducing image to %1x%2 pixels?</source>
<source>Firewalled</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The DHT allows you to answer connection
requests from your friends using BitTorrent&apos;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. </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Public: DHT &amp; Discovery</source>
<translation type="unfinished"></translation>
@ -10149,6 +10200,18 @@ p, li { white-space: pre-wrap; }
<source>Max. tunnel requests forwarded per second:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The DHT allows you to answer connection
requests from your friends using BitTorrent&apos;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. </source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Settings</name>