Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-20 05:56:05 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added patch from Henry

Browse Source 
- renamed own/your to my
- renamed gpg to pgp
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-11-28 19:58:14 +00:00
parent 163b1286f9
commit 224ece5795
21 changed files with 157 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/ChannelFeed.cpp
View File

@ -86,7 +86,7 @@ ChannelFeed::ChannelFeed(QWidget *parent)
/* Initialize group tree */
treeWidget->initDisplayMenu(displayButton);
ownChannels = treeWidget->addCategoryItem(tr("Own Channels"), QIcon(IMAGE_CHANNELBLUE), true);
ownChannels = treeWidget->addCategoryItem(tr("My Channels"), QIcon(IMAGE_CHANNELBLUE), true);
subcribedChannels = treeWidget->addCategoryItem(tr("Subscribed Channels"), QIcon(IMAGE_CHANNELRED), true);
popularChannels = treeWidget->addCategoryItem(tr("Popular Channels"), QIcon(IMAGE_CHANNELGREEN ), false);
otherChannels = treeWidget->addCategoryItem(tr("Other Channels"), QIcon(IMAGE_CHANNELYELLOW), false);

2
retroshare-gui/src/gui/ForumsDialog.cpp
View File

@ -165,7 +165,7 @@ ForumsDialog::ForumsDialog(QWidget *parent)
ui.forumTreeWidget->initDisplayMenu(ui.displayButton);
/* create forum tree */
yourForums = ui.forumTreeWidget->addCategoryItem(tr("Your Forums"), QIcon(IMAGE_FOLDER), true);
yourForums = ui.forumTreeWidget->addCategoryItem(tr("My Forums"), QIcon(IMAGE_FOLDER), true);
subscribedForums = ui.forumTreeWidget->addCategoryItem(tr("Subscribed Forums"), QIcon(IMAGE_FOLDERRED), true);
popularForums = ui.forumTreeWidget->addCategoryItem(tr("Popular Forums"), QIcon(IMAGE_FOLDERGREEN), false);
otherForums = ui.forumTreeWidget->addCategoryItem(tr("Other Forums"), QIcon(IMAGE_FOLDERYELLOW), false);

2
retroshare-gui/src/gui/ForumsV2Dialog.cpp
View File

@ -207,7 +207,7 @@ ForumsV2Dialog::ForumsV2Dialog(QWidget *parent)
ui.forumTreeWidget->initDisplayMenu(ui.displayButton);
/* create forum tree */
yourForums = ui.forumTreeWidget->addCategoryItem(tr("Your Forums"), QIcon(IMAGE_FOLDER), true);
yourForums = ui.forumTreeWidget->addCategoryItem(tr("My Forums"), QIcon(IMAGE_FOLDER), true);
subscribedForums = ui.forumTreeWidget->addCategoryItem(tr("Subscribed Forums"), QIcon(IMAGE_FOLDERRED), true);
popularForums = ui.forumTreeWidget->addCategoryItem(tr("Popular Forums"), QIcon(IMAGE_FOLDERGREEN), false);
otherForums = ui.forumTreeWidget->addCategoryItem(tr("Other Forums"), QIcon(IMAGE_FOLDERYELLOW), false);

22
retroshare-gui/src/gui/GenCertDialog.ui
View File

@ -54,7 +54,7 @@
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="no_gpg_key_label">
<property name="text">
<string>It looks like you don't own any Profile (GPG keys). Please fill in the form below to generate one, or import an existing profile.</string>
<string>It looks like you don't own any profile (PGP keys). Please fill in the form below to create one, or import an existing profile.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -64,7 +64,7 @@
<item row="2" column="1">
<widget class="QComboBox" name="genPGPuser">
<property name="toolTip">
<string>Your profile is associated to a GPG key. RetroShare currently ignores DSA keys.</string>
<string>Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.</string>
</property>
</widget>
</item>
@ -78,7 +78,7 @@
<item row="3" column="1">
<widget class="QLineEdit" name="name_input">
<property name="toolTip">
<string>Enter here your nickname</string>
<string>Enter your nickname here</string>
</property>
</widget>
</item>
@ -93,7 +93,7 @@
<widget class="QLineEdit" name="email_input">
<property name="toolTip">
<string>Be careful: this email will be visible to your friends and friends
of your friends. This information is required by GPG, but to stay
of your friends. This information is required by PGP, but to stay
anonymous, you can use a fake email.</string>
</property>
</widget>
@ -101,7 +101,7 @@ anonymous, you can use a fake email.</string>
<item row="5" column="0">
<widget class="QLabel" name="password_label">
<property name="toolTip">
<string>This Password is for GPG</string>
<string>This Password is for PGP</string>
</property>
<property name="text">
<string>Password</string>
@ -111,7 +111,7 @@ anonymous, you can use a fake email.</string>
<item row="5" column="1">
<widget class="QLineEdit" name="password_input">
<property name="toolTip">
<string>Put a strong password here. This password protects your GPG key.</string>
<string>Put a strong password here. This password protects your PGP key.</string>
</property>
<property name="inputMask">
<string/>
@ -143,7 +143,7 @@ anonymous, you can use a fake email.</string>
<number>1</number>
</property>
<property name="text">
<string>Put a meaningful location. ex : home, laptop, etc. This field will be used to differentiate different installations with the same identity (gpg key).</string>
<string>Put a meaningful location. ex : home, laptop, etc. This field will be used to differentiate different installations with the same identity (PGP key).</string>
</property>
<property name="scaledContents">
<bool>false</bool>
@ -162,7 +162,7 @@ anonymous, you can use a fake email.</string>
</size>
</property>
<property name="text">
<string>Generate New Identity</string>
<string>Create new identity</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
@ -210,10 +210,10 @@ anonymous, you can use a fake email.</string>
</size>
</property>
<property name="toolTip">
<string>Your profile is associated to a GPG key</string>
<string>Your profile is associated with a PGP key</string>
</property>
<property name="text">
<string>Generate a new identity</string>
<string>Create a new identity</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
@ -328,7 +328,7 @@ anonymous, you can use a fake email.</string>
<item>
<widget class="QLabel" name="headerLabel2">
<property name="text">
<string>RetroShare uses gpg keys for identity management.</string>
<string>RetroShare uses PGP keys for identity management.</string>
</property>
</widget>
</item>

2
retroshare-gui/src/gui/MessengerWindow.ui
View File

@ -147,7 +147,7 @@
<item>
<widget class="QToolButton" name="shareButton">
<property name="toolTip">
<string>Share Files for your Friends</string>
<string>Share files for your friends</string>
</property>
<property name="icon">
<iconset>

2
retroshare-gui/src/gui/NetworkDialog.cpp
View File

@ -417,7 +417,7 @@ void NetworkDialog::insertConnect()
if (detail.ownsign)
{
item -> setText(2, tr("Personal signature"));
item -> setToolTip(2, tr("GPG key signed by you"));
item -> setToolTip(2, tr("PGP key signed by you"));
}
else
switch(detail.trustLvl)

2
retroshare-gui/src/gui/Posted/PostedListDialog.cpp
View File

@ -77,7 +77,7 @@ PostedListDialog::PostedListDialog(QWidget *parent)
//ui.groupTreeWidget->initDisplayMenu(ui.displayButton);
/* create forum tree */
yourTopics = ui.groupTreeWidget->addCategoryItem(tr("Your Topics"), QIcon(IMAGE_FOLDER), true);
yourTopics = ui.groupTreeWidget->addCategoryItem(tr("My Topics"), QIcon(IMAGE_FOLDER), true);
subscribedTopics = ui.groupTreeWidget->addCategoryItem(tr("Subscribed Topics"), QIcon(IMAGE_FOLDERRED), true);
popularTopics = ui.groupTreeWidget->addCategoryItem(tr("Popular Topics"), QIcon(IMAGE_FOLDERGREEN), false);
otherTopics = ui.groupTreeWidget->addCategoryItem(tr("Other Topics"), QIcon(IMAGE_FOLDERYELLOW), false);

2
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -592,7 +592,7 @@ QString RetroShareLink::title() const
case TYPE_MESSAGE:
return PeerDefs::rsidFromId(hash().toStdString());
case TYPE_CERTIFICATE:
return QObject::tr("Click to add this RetroShare cert to your GPG keyring\nand open the Make Friend Wizard.\n") + QString("GPG Id = ") + GPGId() + QString("\nSSLId = ")+SSLId();
return QObject::tr("Click to add this RetroShare cert to your PGP keyring\nand open the Make Friend Wizard.\n") + QString("GPG Id = ") + GPGId() + QString("\nSSLId = ")+SSLId();
}
return "";

2
retroshare-gui/src/gui/SearchDialog.ui
View File

@ -434,7 +434,7 @@
<string>Include files from your own file list in the search result</string>
</property>
<property name="text">
<string>Include own files</string>
<string>Include my files</string>
</property>
</widget>
</item>

2
retroshare-gui/src/gui/StartDialog.ui
View File

@ -205,7 +205,7 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Name (GPG Id) - location:</string>
<string>Name (PGP Id) - location:</string>
</property>
</widget>
</item>

2
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -413,7 +413,7 @@ void ChatWidget::contextMenu(QPoint point)
contextMnu->addSeparator();
QAction *action = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink()));
action->setDisabled(RSLinkClipboard::empty());
contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste own certificate link"), this, SLOT(pasteOwnCertificateLink()));
contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste my certificate link"), this, SLOT(pasteOwnCertificateLink()));
contextMnu->exec(QCursor::pos());
delete(contextMnu);

6
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -234,7 +234,7 @@ void ConfCertDialog::load()
ui.radioButton_trust_never->hide();
ui.is_signing_me->hide();
ui.signersBox->setTitle(tr("Your key is signed by : "));
ui.signersBox->setTitle(tr("My key is signed by : "));
} else {
ui.web_of_trust_label->show();
@ -319,9 +319,9 @@ void ConfCertDialog::load()
}
if (detail.hasSignedMe) {
ui.is_signing_me->setText(tr("Peer has authenticated me as a friend and did sign my GPG key"));
ui.is_signing_me->setText(tr("Peer has authenticated me as a friend and did sign my PGP key"));
} else {
ui.is_signing_me->setText(tr("Peer has not authenticated me as a friend and did not sign my GPG key"));
ui.is_signing_me->setText(tr("Peer has not authenticated me as a friend and did not sign my PGP key"));
}
}

2
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -122,7 +122,7 @@ void ConnectFriendWizard::setCertificate(const QString &certificate, bool friend
void ConnectFriendWizard::setGpgId(const std::string &gpgId, bool friendRequest)
{
if (!rsPeers->getPeerDetails(gpgId, peerDetails)) {
setField("errorMessage", tr("Cannot get peer details of gpg key %1").arg(QString::fromStdString(gpgId)));
setField("errorMessage", tr("Cannot get peer details of PGP key %1").arg(QString::fromStdString(gpgId)));
setStartId(Page_ErrorMessage);
return;
}

2
retroshare-gui/src/gui/forums/CreateForumMsg.cpp
View File

@ -83,7 +83,7 @@ void CreateForumMsg::forumMessageCostumPopupMenu(QPoint point)
contextMnu->addSeparator();
QAction *pasteLinkAct = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink()));
QAction *pasteLinkFullAct = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste full RetroShare Link"), this, SLOT(pasteLinkFull()));
contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste own certificate link"), this, SLOT(pasteOwnCertificateLink()));
contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste my certificate link"), this, SLOT(pasteOwnCertificateLink()));
if (RSLinkClipboard::empty()) {
pasteLinkAct->setDisabled (true);

2
retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.cpp
View File

@ -88,7 +88,7 @@ void CreateForumV2Msg::forumMessageCostumPopupMenu(QPoint point)
contextMnu->addSeparator();
QAction *pasteLinkAct = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink()));
QAction *pasteLinkFullAct = contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste full RetroShare Link"), this, SLOT(pasteLinkFull()));
contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste own certificate link"), this, SLOT(pasteOwnCertificateLink()));
contextMnu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste my certificate link"), this, SLOT(pasteOwnCertificateLink()));
if (RSLinkClipboard::empty()) {
pasteLinkAct->setDisabled (true);

2
retroshare-gui/src/gui/help/content/de/peerdetails.html
View File

@ -36,7 +36,7 @@ Peer Details Trust settings and Signing
<td><img src="qrc:/images/trustsettings.png"/></td>
<p>
The trust settings refers to the gnupg web of trust mecanism. <br>
This trust means how you trust your friends when he is signing other gpg keys. <br>
This trust means how you trust your friends when he is signing other PGP keys. <br>
If you set your trust to "full", it means that when your friend sign a key, this key will be shown as validated by the web of trust in the network view.</p>

2
retroshare-gui/src/gui/help/content/en/peerdetails.html
View File

@ -36,7 +36,7 @@ Trust settings and Signing
<td><img src="qrc:/images/trustsettings.png"/></td>
<p>
The trust settings refers to the gnupg web of trust mecanism. <br>
This trust means how you trust your friends when he is signing other gpg keys. <br>
This trust means how you trust your friends when he is signing other PGP keys. <br>
If you set your trust to "full", it means that when your friend sign a key, this key will be shown as validated by the web of trust in the network view.</p>

2
retroshare-gui/src/gui/notifyqt.cpp
View File

@ -150,7 +150,7 @@ bool NotifyQt::askForPassword(const std::string& key_details, bool prev_is_bad,
RsAutoUpdatePage::lockAllEvents() ;
QInputDialog dialog;
dialog.setWindowTitle(tr("GPG key passphrase"));
dialog.setWindowTitle(tr("PGP key passphrase"));
dialog.setLabelText((prev_is_bad?tr("Wrong password !") + "\n\n" : QString()) +
tr("Please enter the password to unlock your PGP key:") + "\n" + QString::fromUtf8(key_details.c_str()));
dialog.setTextEchoMode(QLineEdit::Password);

2
retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp
View File

@ -74,7 +74,7 @@ BlogsDialog::BlogsDialog(QWidget *parent)
itemFont = QFont("ARIAL", 10);
itemFont.setBold(true);
QStandardItem *OwnBlogs = new QStandardItem(tr("Own Blogs"));
QStandardItem *OwnBlogs = new QStandardItem(tr("My Blogs"));
OwnBlogs->setForeground(QBrush(QColor(79, 79, 79)));
OwnBlogs->setFont(itemFont);

248
retroshare-gui/src/lang/retroshare_en.ts
View File

@ -409,10 +409,6 @@ p, li { white-space: pre-wrap; }
<source>ID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Own Blogs</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Subscribed Blogs</source>
<translation type="unfinished"></translation>
@ -459,6 +455,10 @@ p, li { white-space: pre-wrap; }
&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-size:9pt;&quot;&gt;Unsubscribe To Blog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>My Blogs</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BlogsMsgItem</name>
@ -784,10 +784,6 @@ p, li { white-space: pre-wrap; }
<source>Enable Auto-Download</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Own Channels</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Subscribed Channels</source>
<translation type="unfinished"></translation>
@ -860,6 +856,10 @@ p, li { white-space: pre-wrap; }
<source>Publish rights can&apos;t be restored for this channel.&lt;br/&gt;You&apos;re not the creator of this channel.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>My Channels</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ChannelUserNotify</name>
@ -1379,11 +1379,11 @@ Please choose one of it to chat with.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Paste own certificate link</source>
<source>appears to be Offline.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>appears to be Offline.</source>
<source>Paste my certificate link</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1523,10 +1523,6 @@ p, li { white-space: pre-wrap; }
<source>Error : cannot get peer details.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your key is signed by : </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Peer key is signed by : </source>
<translation type="unfinished"></translation>
@ -1551,14 +1547,6 @@ p, li { white-space: pre-wrap; }
<source>Your trust in this peer is not set.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Peer has authenticated me as a friend and did sign my GPG key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Peer has not authenticated me as a friend and did not sign my GPG key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Signature Failure</source>
<translation type="unfinished"></translation>
@ -1584,6 +1572,18 @@ p, li { white-space: pre-wrap; }
<source>Other info</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>My key is signed by : </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Peer has authenticated me as a friend and did sign my PGP key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Peer has not authenticated me as a friend and did not sign my PGP key</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ConnectFriendWizard</name>
@ -1923,10 +1923,6 @@ p, li { white-space: pre-wrap; }
<source>Details about the request</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot get peer details of gpg key %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You have a friend request from</source>
<translation type="unfinished"></translation>
@ -1956,6 +1952,10 @@ p, li { white-space: pre-wrap; }
<source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot get peer details of PGP key %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateBlog</name>
@ -2615,11 +2615,11 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<source>Paste own certificate link</source>
<source>Start New Thread</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Start New Thread</source>
<source>Paste my certificate link</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -2748,10 +2748,6 @@ p, li { white-space: pre-wrap; }
<source>Paste full RetroShare Link</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Paste own certificate link</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In Reply to</source>
<translation type="unfinished"></translation>
@ -2768,6 +2764,10 @@ p, li { white-space: pre-wrap; }
<source>Add Extra File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Paste my certificate link</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateGroup</name>
@ -3963,10 +3963,6 @@ p, li { white-space: pre-wrap; }
<source>PrintPreview</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your Forums</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Subscribed Forums</source>
<translation type="unfinished"></translation>
@ -4123,6 +4119,10 @@ p, li { white-space: pre-wrap; }
<source>Search Content</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>My Forums</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ForumsFillThread</name>
@ -4233,10 +4233,6 @@ p, li { white-space: pre-wrap; }
<source>PrintPreview</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your Forums</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Subscribed Forums</source>
<translation type="unfinished"></translation>
@ -4393,6 +4389,10 @@ p, li { white-space: pre-wrap; }
<source>You can&apos;t reply to a non-existant Message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>My Forums</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FriendList</name>
@ -4969,40 +4969,18 @@ p, li { white-space: pre-wrap; }
<source>Create new Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your profile is associated to a GPG key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter here your nickname</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Email</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Be careful: this email will be visible to your friends and friends
of your friends. This information is required by GPG, but to stay
anonymous, you can use a fake email.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This Password is for GPG</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Put a strong password here. This password protects your GPG key.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Location</source>
<translation type="unfinished"></translation>
@ -5057,14 +5035,6 @@ Fill in your GPG password when asked, to sign your new key.</source>
<source>[Required] This password protects your PGP key.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>It looks like you don&apos;t own any Profile (GPG keys). Please fill in the form below to generate one, or import an existing profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate a new identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import new identity</source>
<translation type="unfinished"></translation>
@ -5077,14 +5047,6 @@ Fill in your GPG password when asked, to sign your new key.</source>
<source>Use identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your profile is associated to a GPG key. RetroShare currently ignores DSA keys.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate New Identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create new Identity</source>
<translation type="unfinished"></translation>
@ -5141,10 +5103,6 @@ and use the import button to load it</source>
<source>You can install retroshare on different locations using the same identity. For this, just export the selected identity, and import it on the new computer, then create a new location with it.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Put a meaningful location. ex : home, laptop, etc. This field will be used to differentiate different installations with the same identity (gpg key).</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your identity was not saved. An error occurred.</source>
<translation type="unfinished"></translation>
@ -5153,10 +5111,6 @@ and use the import button to load it</source>
<source>Your identity was imported successfully:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RetroShare uses gpg keys for identity management.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can create a new identity with this form.</source>
<translation type="unfinished"></translation>
@ -5169,6 +5123,52 @@ and use the import button to load it</source>
<source>Failed to Generate your new Certificate, maybe PGP password is wrong!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>It looks like you don&apos;t own any profile (PGP keys). Please fill in the form below to create one, or import an existing profile.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter your nickname here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Be careful: this email will be visible to your friends and friends
of your friends. This information is required by PGP, but to stay
anonymous, you can use a fake email.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This Password is for PGP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Put a strong password here. This password protects your PGP key.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Put a meaningful location. ex : home, laptop, etc. This field will be used to differentiate different installations with the same identity (PGP key).</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create new identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your profile is associated with a PGP key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create a new identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RetroShare uses PGP keys for identity management.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GeneralPage</name>
@ -7287,10 +7287,6 @@ Do you want to save message ?</source>
<source>Add a Friend</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Share Files for your Friends</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Friends</source>
<translation type="unfinished"></translation>
@ -7299,6 +7295,10 @@ Do you want to save message ?</source>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Share files for your friends</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MsgItem</name>
@ -7540,10 +7540,6 @@ Do you want to save message ?</source>
<source>Personal signature</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GPG key signed by you</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Marginally trusted peer</source>
<translation type="unfinished"></translation>
@ -7585,6 +7581,10 @@ Right-click and select &apos;make friend&apos; to be able to connect.</source>
<source>Search Peer ID</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP key signed by you</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NetworkPage</name>
@ -7787,10 +7787,6 @@ Right-click and select &apos;make friend&apos; to be able to connect.</source>
</context>
<context>
<name>NotifyQt</name>
<message>
<source>GPG key passphrase</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Wrong password !</source>
<translation type="unfinished"></translation>
@ -7827,6 +7823,10 @@ Right-click and select &apos;make friend&apos; to be able to connect.</source>
<source>Please enter the password to unlock your PGP key:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PGP key passphrase</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OnlineToaster</name>
@ -8662,10 +8662,6 @@ malicious behavior of crafted plugins.</source>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Your Topics</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Subscribed Topics</source>
<translation type="unfinished"></translation>
@ -8722,6 +8718,10 @@ malicious behavior of crafted plugins.</source>
<source>AUTHD</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>My Topics</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PrintPreview</name>
@ -9022,12 +9022,6 @@ and use the import button to load it</source>
<source>Maybe password is wrong</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Click to add this RetroShare cert to your GPG keyring
and open the Make Friend Wizard.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add file</source>
<translation type="unfinished"></translation>
@ -9222,14 +9216,6 @@ and open the Make Friend Wizard.
Reported error is: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although GPG keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Initialization failed. Wrong or missing installation of gpg.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>An unexpected error occurred. Please report &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</source>
<translation type="unfinished"></translation>
@ -9260,6 +9246,20 @@ Reported error is: %2</source>
<source>Failed to process collection file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Click to add this RetroShare cert to your PGP keyring
and open the Make Friend Wizard.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Initialization failed. Wrong or missing installation of PGP.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QuickStartWizard</name>
@ -9806,10 +9806,6 @@ Reducing image to %1x%2 pixels?</source>
<source>Include files from your own file list in the search result</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Include own files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search inside &quot;browsable&quot; files of your friends</source>
<translation type="unfinished"></translation>
@ -9883,6 +9879,10 @@ Reducing image to %1x%2 pixels?</source>
<source>Close all Search Results</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Include my files</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SecurityItem</name>
@ -10566,10 +10566,6 @@ p, li { white-space: pre-wrap; }
<source>Log In</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name (GPG Id) - location:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remember Password</source>
<translation type="unfinished"></translation>
@ -10614,6 +10610,10 @@ This choice can be reverted in settings.</source>
This choice can be reverted in settings.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name (PGP Id) - location:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>StatusDefs</name>

4
retroshare-gui/src/main.cpp
View File

@ -123,7 +123,7 @@ int main(int argc, char *argv[])
LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
QMessageBox msgBox;
msgBox.setText(QObject::tr("This version of RetroShare is using OpenPGP-SDK. As a side effect, it's not using the system shared PGP keyring, but has it's own keyring shared by all RetroShare instances. <br><br>You do not appear to have such a keyring, although GPG keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software."));
msgBox.setText(QObject::tr("This version of RetroShare is using OpenPGP-SDK. As a side effect, it's not using the system shared PGP keyring, but has it's own keyring shared by all RetroShare instances. <br><br>You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software."));
msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Ok);
@ -162,7 +162,7 @@ int main(int argc, char *argv[])
{
case RS_INIT_AUTH_FAILED:
std::cerr << "RsInit::InitRetroShare AuthGPG::InitAuth failed" << std::endl;
mb.setText(QObject::tr("Initialization failed. Wrong or missing installation of gpg."));
mb.setText(QObject::tr("Initialization failed. Wrong or missing installation of PGP."));
break;
default:
/* Unexpected return code */