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

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