From 8e0be294ee80cff4d28f1fa8e90dd3f6d18f31fc Mon Sep 17 00:00:00 2001 From: electron128 Date: Mon, 1 Jun 2015 18:46:33 +0000 Subject: [PATCH] fix more typos in strings (patch from Henry) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8338 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/ChatLobbyWidget.cpp | 2 +- retroshare-gui/src/gui/Identity/IdDialog.cpp | 22 ++++++++++++------- retroshare-gui/src/gui/NetworkDialog.cpp | 12 +++++----- .../src/gui/connect/ConfCertDialog.ui | 4 ++-- .../src/gui/msgs/MessageComposer.cpp | 2 +- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index d19e525c6..23154cac7 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -247,7 +247,7 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint) if(own_identities.empty()) { - contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Create a nickname and enter this lobby"), this, SLOT(createIdentityAndSubscribe())); + contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Create an identity and enter this lobby"), this, SLOT(createIdentityAndSubscribe())); } else if(own_identities.size() == 1) { diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index b77cd834c..5b0cbe484 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -549,12 +549,18 @@ static QString getHumanReadableDuration(uint32_t seconds) { if(seconds < 60) return QString(QObject::tr("%1 seconds ago")).arg(seconds) ; + else if(seconds < 120) + return QString(QObject::tr("%1 minute ago")).arg(seconds/60) ; else if(seconds < 3600) - return QString(QObject::tr("%1 minute(s) ago")).arg(seconds/60) ; + return QString(QObject::tr("%1 minutes ago")).arg(seconds/60) ; + else if(seconds < 7200) + return QString(QObject::tr("%1 hour ago")).arg(seconds/3600) ; else if(seconds < 24*3600) - return QString(QObject::tr("%1 hour(s) ago")).arg(seconds/3600) ; - else - return QString(QObject::tr("%1 day(s) ago")).arg(seconds/86400) ; + return QString(QObject::tr("%1 hours ago")).arg(seconds/3600) ; + else if(seconds < 2*24*3600) + return QString(QObject::tr("%1 day ago")).arg(seconds/86400) ; + else + return QString(QObject::tr("%1 days ago")).arg(seconds/86400) ; } void IdDialog::insertIdDetails(uint32_t token) @@ -720,15 +726,15 @@ void IdDialog::insertIdDetails(uint32_t token) if (data.mPgpKnown) { - ui->line_RatingImplicit->setText("+50 Known PGP"); + ui->line_RatingImplicit->setText(tr("+50 Known PGP")); } else if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID) { - ui->line_RatingImplicit->setText("+10 UnKnown PGP"); + ui->line_RatingImplicit->setText(tr("+10 UnKnown PGP")); } else { - ui->line_RatingImplicit->setText("+5 Anon Id"); + ui->line_RatingImplicit->setText(tr("+5 Anon Id")); } { @@ -858,7 +864,7 @@ void IdDialog::removeIdentity() return; } - if ((QMessageBox::question(this, tr("Really delete? "), tr("Do you really want to delete this Identity?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::No))== QMessageBox::Yes) + if ((QMessageBox::question(this, tr("Really delete? "), tr("Do you really want to delete this identity?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::No))== QMessageBox::Yes) { std::string keyId = item->text(RSID_COL_KEYID).toStdString(); diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index aa4fa9f10..dd42ad984 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -107,16 +107,16 @@ NetworkDialog::NetworkDialog(QWidget *parent) _header->model()->setHeaderData(COLUMN_CHECK, Qt::Horizontal, tr("")); _header->model()->setHeaderData(COLUMN_PEERNAME, Qt::Horizontal, tr("Name")); _header->model()->setHeaderData(COLUMN_I_AUTH_PEER, Qt::Horizontal, tr("Trust level")); - _header->model()->setHeaderData(COLUMN_PEER_AUTH_ME, Qt::Horizontal, tr("Did peer authenticated me")); + _header->model()->setHeaderData(COLUMN_PEER_AUTH_ME, Qt::Horizontal, tr("Did peer authenticate you")); _header->model()->setHeaderData(COLUMN_PEERID, Qt::Horizontal, tr("Cert Id")); _header->model()->setHeaderData(COLUMN_LAST_USED, Qt::Horizontal, tr("Last used")); _header->model()->setHeaderData(COLUMN_CHECK, Qt::Horizontal, tr(" Do you accept connections signed by this key?"),Qt::ToolTipRole); _header->model()->setHeaderData(COLUMN_PEERNAME, Qt::Horizontal, tr("Name of the key"),Qt::ToolTipRole); - _header->model()->setHeaderData(COLUMN_I_AUTH_PEER, Qt::Horizontal, tr("This column indicates trust level and whether you signed his PGP key"),Qt::ToolTipRole); - _header->model()->setHeaderData(COLUMN_PEER_AUTH_ME, Qt::Horizontal, tr("Did that peer sign your own PGP key"),Qt::ToolTipRole); + _header->model()->setHeaderData(COLUMN_I_AUTH_PEER, Qt::Horizontal, tr("This column indicates trust level and whether you signed their PGP key"),Qt::ToolTipRole); + _header->model()->setHeaderData(COLUMN_PEER_AUTH_ME, Qt::Horizontal, tr("Did that peer sign your PGP key"),Qt::ToolTipRole); _header->model()->setHeaderData(COLUMN_PEERID, Qt::Horizontal, tr("Certificat ID"),Qt::ToolTipRole); - _header->model()->setHeaderData(COLUMN_LAST_USED, Qt::Horizontal, tr("Since when I use this Certificats"),Qt::ToolTipRole); + _header->model()->setHeaderData(COLUMN_LAST_USED, Qt::Horizontal, tr("Since when I use this certificate"),Qt::ToolTipRole); _header->resizeSection ( COLUMN_CHECK, 25 ); _header->resizeSection ( COLUMN_PEERNAME, 200 ); @@ -162,8 +162,8 @@ NetworkDialog::NetworkDialog(QWidget *parent) timer2->start(1000); /* add filter actions */ - ui.filterLineEdit->addFilter(QIcon(), tr("Name"), COLUMN_PEERNAME, tr("Search Name")); - ui.filterLineEdit->addFilter(QIcon(), tr("Peer ID"), COLUMN_PEERID, tr("Search Peer ID")); + ui.filterLineEdit->addFilter(QIcon(), tr("Name"), COLUMN_PEERNAME, tr("Search name")); + ui.filterLineEdit->addFilter(QIcon(), tr("Peer ID"), COLUMN_PEERID, tr("Search peer ID")); ui.filterLineEdit->setCurrentFilter(COLUMN_PEERNAME); //updateNetworkStatus(); diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index 7123f5179..58a0f0741 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -161,7 +161,7 @@ - <html><head/><body><p>This is the ID of the node's <span style=" font-weight:600;">SSL</span> certifcate, that is signed by the above <span style=" font-weight:600;">PGP</span> key. </p></body></html> + <html><head/><body><p>This is the ID of the node's <span style=" font-weight:600;">SSL</span> certifcate, which is signed by the above <span style=" font-weight:600;">PGP</span> key. </p></body></html> true @@ -178,7 +178,7 @@ - <html><head/><body><p>The encryption string is given by <span style=" font-weight:600;">SSL</span>. The connection to friend nodes</p><p>is always heavily encrypted, but If DHE is present, the connection further uses</p><p>&quot;perfect forward secrecy&quot;.</p></body></html> + <html><head/><body><p>The encryption string is given by <span style=" font-weight:600;">SSL</span>. The connection to friend nodes</p><p>is always heavily encrypted and if DHE is present the connection further uses</p><p>&quot;perfect forward secrecy&quot;.</p></body></html> true diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 6bb6400db..cbef4c751 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -1438,7 +1438,7 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox) if(mi.rsgxsid_srcId.isNull() && !(mi.rsgxsid_msgto.empty() && mi.rsgxsid_msgcc.empty() && mi.rsgxsid_msgbcc.empty())) { - QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers fro the destination list."), QMessageBox::Ok); + QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers from the destination list."), QMessageBox::Ok); return false; // Don't send if cannot sign. } if (rsMail->MessageSend(mi) == false) {