Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed whitespaces in strings (patch from Henry)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-06-12 08:27:26 +00:00
parent dd4760c25f
commit d9e1473533
33 changed files with 181 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View File

@ -136,13 +136,13 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
/** Setup the actions for the header context menu */ /** Setup the actions for the header context menu */
showUserCountAct= new QAction(headerItem->text(COLUMN_USER_COUNT),this); showUserCountAct= new QAction(headerItem->text(COLUMN_USER_COUNT),this);
showUserCountAct->setCheckable(true); showUserCountAct->setToolTip(tr("Show ")+showUserCountAct->text()+tr(" Column")); showUserCountAct->setCheckable(true); showUserCountAct->setToolTip(tr("Show")+" "+showUserCountAct->text()+" "+tr("column"));
connect(showUserCountAct,SIGNAL(triggered(bool)),this,SLOT(setShowUserCountColumn(bool))) ; connect(showUserCountAct,SIGNAL(triggered(bool)),this,SLOT(setShowUserCountColumn(bool))) ;
showTopicAct= new QAction(headerItem->text(COLUMN_TOPIC),this); showTopicAct= new QAction(headerItem->text(COLUMN_TOPIC),this);
showTopicAct->setCheckable(true); showTopicAct->setToolTip(tr("Show ")+showTopicAct->text()+tr(" Column")); showTopicAct->setCheckable(true); showTopicAct->setToolTip(tr("Show")+" "+showTopicAct->text()+" "+tr("column"));
connect(showTopicAct,SIGNAL(triggered(bool)),this,SLOT(setShowTopicColumn(bool))) ; connect(showTopicAct,SIGNAL(triggered(bool)),this,SLOT(setShowTopicColumn(bool))) ;
showSubscribeAct= new QAction(headerItem->text(COLUMN_SUBSCRIBED),this); showSubscribeAct= new QAction(headerItem->text(COLUMN_SUBSCRIBED),this);
showSubscribeAct->setCheckable(true); showSubscribeAct->setToolTip(tr("Show ")+showSubscribeAct->text()+tr(" Column")); showSubscribeAct->setCheckable(true); showSubscribeAct->setToolTip(tr("Show")+" "+showSubscribeAct->text()+" "+tr("column"));
connect(showSubscribeAct,SIGNAL(triggered(bool)),this,SLOT(setShowSubscribeColumn(bool))) ; connect(showSubscribeAct,SIGNAL(triggered(bool)),this,SLOT(setShowSubscribeColumn(bool))) ;
// Set initial size of the splitter // Set initial size of the splitter
@ -334,10 +334,10 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby
for (int column = 0; column < COLUMN_COUNT; ++column) { for (int column = 0; column < COLUMN_COUNT; ++column) {
item->setTextColor(column, color); item->setTextColor(column, color);
} }
item->setToolTip(0,QObject::tr("Subject: ")+item->text(COLUMN_TOPIC)+"\n" item->setToolTip(0,QObject::tr("Subject:")+" "+item->text(COLUMN_TOPIC)+"\n"
+QObject::tr("Participants: ")+QString::number(count)+"\n" +QObject::tr("Participants:")+" "+QString::number(count)+"\n"
+QObject::tr("Auto Subscribe: ")+(autoSubscribe? QObject::tr("enabled"): QObject::tr("disabled"))+"\n" +QObject::tr("Auto Subscribe:")+" "+(autoSubscribe? QObject::tr("enabled"): QObject::tr("disabled"))+"\n"
+QObject::tr("Id: ")+QString::number(id,16)) ; +QObject::tr("Id:")+" "+QString::number(id,16)) ;
} }
void ChatLobbyWidget::addChatPage(ChatLobbyDialog *d) void ChatLobbyWidget::addChatPage(ChatLobbyDialog *d)

2
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View File

@ -1039,7 +1039,7 @@ int TransfersDialog::addItem(int row, const FileInfo &fileInfo)
std::string rsversion; std::string rsversion;
if (rsDisc->getPeerVersion(transferInfo.peerId, rsversion)) if (rsDisc->getPeerVersion(transferInfo.peerId, rsversion))
{ {
version = tr("version: ") + QString::fromStdString(rsversion); version = tr("version:")+" " + QString::fromStdString(rsversion);
} }
double peerDlspeed = 0; double peerDlspeed = 0;

8
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -187,11 +187,11 @@ IdDialog::IdDialog(QWidget *parent) :
/** Setup the actions for the header context menu */ /** Setup the actions for the header context menu */
hideIdAct= new QAction(headerItem->text(RSID_COL_KEYID),this); hideIdAct= new QAction(headerItem->text(RSID_COL_KEYID),this);
hideIdAct->setCheckable(true); hideIdAct->setToolTip(tr("Show ")+hideIdAct->text()+tr(" Column")); hideIdAct->setCheckable(true); hideIdAct->setToolTip(tr("Show")+" "+hideIdAct->text()+" "+tr("column"));
connect(hideIdAct,SIGNAL(triggered(bool)),this,SLOT(setHideIdColumn(bool))) ; connect(hideIdAct,SIGNAL(triggered(bool)),this,SLOT(setHideIdColumn(bool))) ;
hideTypeAct= new QAction(headerItem->text(RSID_COL_IDTYPE),this); hideTypeAct= new QAction(headerItem->text(RSID_COL_IDTYPE),this);
hideTypeAct->setCheckable(true); hideTypeAct->setToolTip(tr("Show ")+hideTypeAct->text()+tr(" Column")); hideTypeAct->setCheckable(true); hideTypeAct->setToolTip(tr("Show")+" "+hideTypeAct->text()+" "+tr("column"));
connect(hideTypeAct,SIGNAL(triggered(bool)),this,SLOT(setHideIdTypeColumn(bool))) ; connect(hideTypeAct,SIGNAL(triggered(bool)),this,SLOT(setHideIdTypeColumn(bool))) ;
mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this); mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this);
@ -431,8 +431,8 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
item->setToolTip(RSID_COL_IDTYPE,QString::fromStdString(data.mPgpId.toStdString())) ; item->setToolTip(RSID_COL_IDTYPE,QString::fromStdString(data.mPgpId.toStdString())) ;
tooltip += tr("Node name: ") + QString::fromUtf8(details.name.c_str()) + "\n"; tooltip += tr("Node name:")+" " + QString::fromUtf8(details.name.c_str()) + "\n";
tooltip += tr("Node Id : ") + QString::fromStdString(data.mPgpId.toStdString()) ; tooltip += tr("Node Id :")+" " + QString::fromStdString(data.mPgpId.toStdString()) ;
item->setToolTip(RSID_COL_KEYID,tooltip) ; item->setToolTip(RSID_COL_KEYID,tooltip) ;
} }
else else

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

@ -581,7 +581,7 @@ void MainWindow::displayDiskSpaceWarning(int loc,int size_limit_mb)
return ; return ;
} }
QMessageBox::critical(NULL,tr("Low disk space warning"), QMessageBox::critical(NULL,tr("Low disk space warning"),
tr("The disk space in your ")+locString +tr(" directory is running low (current limit is ")+QString::number(size_limit_mb)+tr("MB). \n\n RetroShare will now safely suspend any disk access to this directory. \n\n Please make some free space and click Ok.")) ; tr("The disk space in your")+" "+locString +" "+tr("directory is running low (current limit is")+" "+QString::number(size_limit_mb)+tr("MB). \n\n RetroShare will now safely suspend any disk access to this directory. \n\n Please make some free space and click Ok.")) ;
} }
/** Creates a tray icon with a context menu and adds it to the system /** Creates a tray icon with a context menu and adds it to the system

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

@ -284,7 +284,7 @@ void NetworkDialog::removeUnusedKeys()
break ; break ;
} }
QMessageBox::warning(NULL,tr("Keyring info"),tr("Key removal has failed. Your keyring remains intact.\n\nReported error: ")+error_string ) ; QMessageBox::warning(NULL,tr("Keyring info"),tr("Key removal has failed. Your keyring remains intact.\n\nReported error:")+" "+error_string ) ;
} }
insertConnect() ; insertConnect() ;
} }

18
retroshare-gui/src/gui/People/IdentityWidget.cpp
View File

@ -63,16 +63,16 @@ void IdentityWidget::updateData(const RsGxsIdGroup &gxs_group_info)
m_myName = QString::fromUtf8(_group_info.mMeta.mGroupName.c_str()); m_myName = QString::fromUtf8(_group_info.mMeta.mGroupName.c_str());
ui->labelName->setText(m_myName); ui->labelName->setText(m_myName);
if (_havePGPDetail) { if (_havePGPDetail) {
ui->labelName->setToolTip(tr("GXS name: ").append(m_myName).append("\n") ui->labelName->setToolTip(tr("GXS name:").append(" "+m_myName).append("\n")
.append(tr("PGP name: ").append(_nickname))); .append(tr("PGP name:").append(" "+_nickname)));
} else {//if (m_myName != _nickname) } else {//if (m_myName != _nickname)
ui->labelName->setToolTip(tr("GXS name: ").append(m_myName)); ui->labelName->setToolTip(tr("GXS name:").append(" "+m_myName));
}//else (m_myName != _nickname) }//else (m_myName != _nickname)
_gxsId = QString::fromStdString(_group_info.mMeta.mGroupId.toStdString()); _gxsId = QString::fromStdString(_group_info.mMeta.mGroupId.toStdString());
ui->labelGXSId->setText(_gxsId); ui->labelGXSId->setText(_gxsId);
ui->labelGXSId->setToolTip(tr("GXS id: ").append(_gxsId)); ui->labelGXSId->setToolTip(tr("GXS id:").append(" "+_gxsId));
if (!_havePGPDetail) { if (!_havePGPDetail) {
QFont font = ui->labelName->font(); QFont font = ui->labelName->font();
@ -81,7 +81,7 @@ void IdentityWidget::updateData(const RsGxsIdGroup &gxs_group_info)
_keyId=QString::fromStdString(_group_info.mMeta.mGroupId.toStdString()); _keyId=QString::fromStdString(_group_info.mMeta.mGroupId.toStdString());
ui->labelKeyId->setText(_keyId); ui->labelKeyId->setText(_keyId);
ui->labelKeyId->setToolTip(tr("GXS id: ").append(_keyId)); ui->labelKeyId->setToolTip(tr("GXS id:").append(" "+_keyId));
ui->labelKeyId->setVisible(false); ui->labelKeyId->setVisible(false);
/// (TODO) Get real ident icon /// (TODO) Get real ident icon
@ -107,10 +107,10 @@ void IdentityWidget::updateData(const RsPeerDetails &pgp_details)
if (!_haveGXSId) m_myName = _nickname; if (!_haveGXSId) m_myName = _nickname;
ui->labelName->setText(m_myName); ui->labelName->setText(m_myName);
if (_haveGXSId) { if (_haveGXSId) {
ui->labelName->setToolTip(tr("GXS name: ").append(m_myName).append("\n") ui->labelName->setToolTip(tr("GXS name:").append(" "+m_myName).append("\n")
.append(tr("PGP name: ").append(_nickname))); .append(tr("PGP name:").append(" "+_nickname)));
} else {//if (m_myName != _nickname) } else {//if (m_myName != _nickname)
ui->labelName->setToolTip(tr("PGP name: ").append(_nickname)); ui->labelName->setToolTip(tr("PGP name:").append(" "+_nickname));
}//else (m_myName != _nickname) }//else (m_myName != _nickname)
QFont font = ui->labelName->font(); QFont font = ui->labelName->font();
@ -119,7 +119,7 @@ void IdentityWidget::updateData(const RsPeerDetails &pgp_details)
_keyId = QString::fromStdString(_details.gpg_id.toStdString()); _keyId = QString::fromStdString(_details.gpg_id.toStdString());
ui->labelKeyId->setText(_keyId); ui->labelKeyId->setText(_keyId);
ui->labelKeyId->setToolTip(tr("PGP id: ").append(_keyId)); ui->labelKeyId->setToolTip(tr("PGP id:").append(" "+_keyId));
QPixmap avatar; QPixmap avatar;
AvatarDefs::getAvatarFromGpgId(_details.gpg_id.toStdString(), avatar); AvatarDefs::getAvatarFromGpgId(_details.gpg_id.toStdString(), avatar);

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

@ -621,10 +621,10 @@ QString RetroShareLink::title() const
uint32_t error_code ; uint32_t error_code ;
if(!rsPeers->loadDetailsFromStringCert(_radix.toStdString(),details,error_code)) if(!rsPeers->loadDetailsFromStringCert(_radix.toStdString(),details,error_code))
return QObject::tr("This cert is malformed. Error code: ")+QString::number(error_code) ; return QObject::tr("This cert is malformed. Error code:")+" "+QString::number(error_code) ;
else else
return QObject::tr("Click to add this RetroShare cert to your PGP keyring\nand open the Make Friend Wizard.\n") return QObject::tr("Click to add this RetroShare cert to your PGP keyring\nand open the Make Friend Wizard.\n")
+ QString("PGP Id = ") + QString::fromStdString(details.gpg_id.toStdString()) + QString("\nSSLId = ")+QString::fromStdString(details.id.toStdString()); + QString("PGP Id =")+" " + QString::fromStdString(details.gpg_id.toStdString()) + QString("\nSSLId =")+" "+QString::fromStdString(details.id.toStdString());
} }
return ""; return "";
@ -757,7 +757,7 @@ QString RetroShareLink::niceName() const
uint32_t error_code ; uint32_t error_code ;
if(!rsPeers->loadDetailsFromStringCert(_radix.toStdString(),details,error_code)) if(!rsPeers->loadDetailsFromStringCert(_radix.toStdString(),details,error_code))
return QObject::tr("This cert is malformed. Error code: ")+QString::number(error_code) ; return QObject::tr("This cert is malformed. Error code:")+" "+QString::number(error_code) ;
else else
return QObject::tr("RetroShare Certificate (%1, @%2)").arg(QString::fromUtf8(details.name.c_str()), QString::fromUtf8(details.location.c_str())); // should add SSL id there return QObject::tr("RetroShare Certificate (%1, @%2)").arg(QString::fromUtf8(details.name.c_str()), QString::fromUtf8(details.location.c_str())); // should add SSL id there
} }

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

@ -54,7 +54,7 @@ ShareDialog::ShareDialog(std::string filename, QWidget *parent)
QVBoxLayout *vbox = new QVBoxLayout() ; QVBoxLayout *vbox = new QVBoxLayout() ;
QHBoxLayout *hb2 = new QHBoxLayout() ; QHBoxLayout *hb2 = new QHBoxLayout() ;
hb2->addWidget(new QLabel(tr("Share flags and groups: "))) ; hb2->addWidget(new QLabel(tr("Share flags and groups:")+" ")) ;
groupflagsbox = new GroupFlagsWidget(ui.shareflags_GB) ; groupflagsbox = new GroupFlagsWidget(ui.shareflags_GB) ;
groupflagsbox->setFlags(DIR_FLAGS_NETWORK_WIDE_OTHERS) ; // default value groupflagsbox->setFlags(DIR_FLAGS_NETWORK_WIDE_OTHERS) ; // default value

12
retroshare-gui/src/gui/TrustView.cpp
View File

@ -197,7 +197,7 @@ void TrustView::update()
if(i_ji == NULL) if(i_ji == NULL)
{ {
i_ij->setBackgroundColor(Qt::yellow) ; i_ij->setBackgroundColor(Qt::yellow) ;
i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + tr(" is authenticated (one way) by " )+trustTableTW->verticalHeaderItem(j)->text()) ; i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() +" "+ tr("is authenticated (one way) by" )+" "+trustTableTW->verticalHeaderItem(j)->text()) ;
i_ij->setText(tr("Half")) ; i_ij->setText(tr("Half")) ;
} }
else else
@ -205,22 +205,22 @@ void TrustView::update()
if(i==j) if(i==j)
{ {
i_ij->setBackgroundColor(Qt::red) ; i_ij->setBackgroundColor(Qt::red) ;
i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + tr(" authenticated himself") ) ; i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() +" "+ tr("authenticated himself") ) ;
} }
else else
{ {
i_ij->setBackgroundColor(Qt::green) ; i_ij->setBackgroundColor(Qt::green) ;
i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + " and " +trustTableTW->verticalHeaderItem(j)->text() + tr(" authenticated each other") ) ; i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + " "+tr("and")+" " +trustTableTW->verticalHeaderItem(j)->text() +" "+ tr("authenticated each other") ) ;
i_ij->setText(tr("Full")) ; i_ij->setText(tr("Full")) ;
} }
} }
} }
} }
for(int i=0;i<trustTableTW->rowCount();++i) for(int i=0;i<trustTableTW->rowCount();++i)
trustTableTW->verticalHeaderItem(i)->setToolTip(trustTableTW->verticalHeaderItem(i)->text()+ tr(" is authenticated by ") + QString::number(ni[i]) + tr(" peers, including him(her)self.")) ; trustTableTW->verticalHeaderItem(i)->setToolTip(trustTableTW->verticalHeaderItem(i)->text()+" "+ tr("is authenticated by")+" " + QString::number(ni[i]) +" "+ tr("peers, including him(her)self.")) ;
for(int j=0;j<trustTableTW->columnCount();++j) for(int j=0;j<trustTableTW->columnCount();++j)
trustTableTW->horizontalHeaderItem(j)->setToolTip(trustTableTW->horizontalHeaderItem(j)->text()+ tr(" authenticated ") + QString::number(nj[j]) + tr(" peers, including him(her)self.")) ; trustTableTW->horizontalHeaderItem(j)->setToolTip(trustTableTW->horizontalHeaderItem(j)->text()+" "+ tr("authenticated")+" " + QString::number(nj[j]) +" "+ tr("peers, including him(her)self.")) ;
} }
@ -256,7 +256,7 @@ void TrustView::hideShowPeers(int col)
trustTableTW->setRowHidden(i,false) ; trustTableTW->setRowHidden(i,false) ;
} }
last_col = col ; last_col = col ;
showingLabel->setText(tr("Showing: peers connected to ")+trustTableTW->verticalHeaderItem(col)->text()) ; showingLabel->setText(tr("Showing: peers connected to")+" "+trustTableTW->verticalHeaderItem(col)->text()) ;
} }
} }

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

@ -107,7 +107,7 @@ void ChatDialog::init(ChatId id, const QString &title)
} else if(id.isGxsId()) { } else if(id.isGxsId()) {
PopupDistantChatDialog* pdcd = new PopupDistantChatDialog(); PopupDistantChatDialog* pdcd = new PopupDistantChatDialog();
QString peer_name = pdcd->getPeerName(id) ; QString peer_name = pdcd->getPeerName(id) ;
pdcd->init(id.toGxsId(), tr("Talking to ")+peer_name) ; pdcd->init(id.toGxsId(), tr("Talking to")+" "+peer_name) ;
cd = pdcd; cd = pdcd;
} else { } else {
RsPeerDetails sslDetails; RsPeerDetails sslDetails;

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

@ -90,7 +90,7 @@ ChatWidget::ChatWidget(QWidget *parent) :
cFoundColor=Settings->getChatSearchFoundColor(); cFoundColor=Settings->getChatSearchFoundColor();
ui->actionSearchWithoutLimit->setText(tr("Don't stop to color after ")+QString::number(uiMaxSearchLimitColor)+tr(" items found (need more CPU)")); ui->actionSearchWithoutLimit->setText(tr("Don't stop to color after")+" "+QString::number(uiMaxSearchLimitColor)+" "+tr("items found (need more CPU)"));
ui->leSearch->setVisible(false); ui->leSearch->setVisible(false);
ui->searchBefore->setVisible(false); ui->searchBefore->setVisible(false);
@ -1033,7 +1033,7 @@ void ChatWidget::updateLenOfChatTextEdit()
} }
ui->sendButton->setEnabled(!msgToLarge); ui->sendButton->setEnabled(!msgToLarge);
text = tr("%1This message consists of %2 characters.").arg(msgToLarge ? tr("Warning: ") : "").arg(msg.length()); text = tr("%1This message consists of %2 characters.").arg(msgToLarge ? tr("Warning:")+" " : "").arg(msg.length());
ui->sendButton->setToolTip(text); ui->sendButton->setToolTip(text);
ui->chatTextEdit->setToolTip(msgToLarge?text:""); ui->chatTextEdit->setToolTip(msgToLarge?text:"");
} }

2
retroshare-gui/src/gui/common/GroupFlagsWidget.cpp
View File

@ -168,7 +168,7 @@ QString GroupFlagsWidget::groupInfoString(FileStorageFlags flags, const QList<QS
if(flags & DIR_FLAGS_NETWORK_WIDE_OTHERS) if(flags & DIR_FLAGS_NETWORK_WIDE_OTHERS)
res += tr("All friend nodes can relay anonymous tunnels to this directory") ; res += tr("All friend nodes can relay anonymous tunnels to this directory") ;
else if(flags & DIR_FLAGS_NETWORK_WIDE_GROUPS) else if(flags & DIR_FLAGS_NETWORK_WIDE_GROUPS)
res += tr("Only friend nodes in groups ") + groups_string + tr(" can relay anonymous tunnels to this directory") ; res += tr("Only friend nodes in groups")+" " + groups_string +" "+ tr("can relay anonymous tunnels to this directory") ;
else else
res += tr("No one can anonymously access this directory.") ; res += tr("No one can anonymously access this directory.") ;

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

@ -311,9 +311,9 @@ void ConfCertDialog::loadInvitePage()
infotext += "<li> a <b>PGP public key</b>"; infotext += "<li> a <b>PGP public key</b>";
infotext += " (" + QString::fromUtf8(detail.name.c_str()) + "@" + detail.gpg_id.toStdString().c_str()+") " ; infotext += " (" + QString::fromUtf8(detail.name.c_str()) + "@" + detail.gpg_id.toStdString().c_str()+") " ;
if(ui._shouldAddSignatures_CB->isChecked()) if(ui._shouldAddSignatures_CB->isChecked())
infotext += tr(" with ")+QString::number(detail.gpgSigners.size()-1)+" external signatures</li> " ; infotext += tr("with")+" "+QString::number(detail.gpgSigners.size()-1)+" "+tr("external signatures</li>") ;
else else
infotext += tr("</li> ") ; infotext += "</li>" ;
infotext += tr("<li>a <b>node ID</b> and <b>name</b>") +" (" + detail.id.toStdString().c_str() + ", " + QString::fromUtf8(detail.location.c_str()) +")" ; infotext += tr("<li>a <b>node ID</b> and <b>name</b>") +" (" + detail.id.toStdString().c_str() + ", " + QString::fromUtf8(detail.location.c_str()) +")" ;
infotext += "</li>" ; infotext += "</li>" ;

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

@ -633,7 +633,7 @@ bool ConnectFriendWizard::validateCurrentPage()
} }
if (certstr.empty()) { if (certstr.empty()) {
setField("errorMessage", QString(tr("Certificate Load Failed:can't read from file %1 ")).arg(fn) ); setField("errorMessage", QString(tr("Certificate Load Failed:can't read from file %1")).arg(fn+" ") );
error = false; error = false;
break; break;
} }

4
retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
View File

@ -195,7 +195,7 @@ void PGPKeyDialog::load()
ui.trustlevel_CB->hide(); ui.trustlevel_CB->hide();
ui.is_signing_me->hide(); ui.is_signing_me->hide();
ui.signersBox->setTitle(tr("This is your own PGP key, and it is signed by : ")); ui.signersBox->setTitle(tr("This is your own PGP key, and it is signed by :")+" ");
} }
else else
@ -203,7 +203,7 @@ void PGPKeyDialog::load()
ui.web_of_trust_label->show(); ui.web_of_trust_label->show();
ui.trustlevel_CB->show(); ui.trustlevel_CB->show();
ui.is_signing_me->show(); ui.is_signing_me->show();
ui.signersBox->setTitle(tr("This key is signed by : ")); ui.signersBox->setTitle(tr("This key is signed by :")+" ");
if (detail.accept_connection) if (detail.accept_connection)
{ {

2
retroshare-gui/src/gui/feeds/SecurityItem.cpp
View File

@ -139,7 +139,7 @@ void SecurityItem::updateItemStatic()
{ {
RsPeerDetails details ; RsPeerDetails details ;
if(rsPeers->getGPGDetails(mGpgId, details)) if(rsPeers->getGPGDetails(mGpgId, details))
title = tr("Missing/Damaged SSL certificate for key ") + QString::fromStdString(mGpgId.toStdString()) ; title = tr("Missing/Damaged SSL certificate for key")+" " + QString::fromStdString(mGpgId.toStdString()) ;
else else
title = tr("Missing/Damaged certificate. Not a real Retroshare user."); title = tr("Missing/Damaged certificate. Not a real Retroshare user.");
requestLabel->hide(); requestLabel->hide();

2
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
View File

@ -314,7 +314,7 @@ void CreateGxsForumMsg::createMsg()
default: default:
std::cerr << "CreateGxsForumMsg::createMsg() ERROR GETTING AuthorId!"; std::cerr << "CreateGxsForumMsg::createMsg() ERROR GETTING AuthorId!";
std::cerr << std::endl; std::cerr << std::endl;
QMessageBox::warning(this, tr("RetroShare"),tr("Congrats, you found a bug! ")+QString(__FILE__)+":"+QString(__LINE__), QMessageBox::Ok, QMessageBox::Ok); QMessageBox::warning(this, tr("RetroShare"),tr("Congrats, you found a bug!")+" "+QString(__FILE__)+":"+QString(__LINE__), QMessageBox::Ok, QMessageBox::Ok);
return; return;
}//switch (ui.idChooser->getChosenId(authorId)) }//switch (ui.idChooser->getChosenId(authorId))

4
retroshare-gui/src/gui/help/browser/helpbrowser.cpp
View File

@ -134,12 +134,12 @@ HelpBrowser::loadContentsFromXml(QString xmlFile)
/* Load the XML contents into the DOM document */ /* Load the XML contents into the DOM document */
if (!document.setContent(&file, true, &errorString)) { if (!document.setContent(&file, true, &errorString)) {
ui.txtBrowser->setPlainText(tr("Error Loading Help Contents: ")+errorString); ui.txtBrowser->setPlainText(tr("Error Loading Help Contents:")+" "+errorString);
return; return;
} }
/* Load the DOM document contents into the tree view */ /* Load the DOM document contents into the tree view */
if (!loadContents(&document, errorString)) { if (!loadContents(&document, errorString)) {
ui.txtBrowser->setPlainText(tr("Error Loading Help Contents: ")+errorString); ui.txtBrowser->setPlainText(tr("Error Loading Help Contents:")+" "+errorString);
return; return;
} }
} }

2
retroshare-gui/src/gui/help/browser/helptextbrowser.cpp
View File

@ -63,7 +63,7 @@ HelpTextBrowser::loadResource(int type, const QUrl &name)
QFile file(helpPath + name.path()); QFile file(helpPath + name.path());
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
return tr("Error opening help file: ") + name.path(); return tr("Error opening help file:")+" "+ name.path();
} }
return QString::fromUtf8(file.readAll()); return QString::fromUtf8(file.readAll());
} }

2
retroshare-gui/src/gui/msgs/MessageWidget.cpp
View File

@ -329,7 +329,7 @@ void MessageWidget::getcurrentrecommended()
std::cout << "Requesting file " << fi.fname << ", size=" << fi.size << ", hash=" << fi.hash << std::endl ; std::cout << "Requesting file " << fi.fname << ", size=" << fi.size << ", hash=" << fi.hash << std::endl ;
if (rsFiles->FileRequest(fi.fname, fi.hash, fi.size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds) == false) { if (rsFiles->FileRequest(fi.fname, fi.hash, fi.size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds) == false) {
QMessageBox mb(QObject::tr("File Request canceled"), QObject::tr("The following has not been added to your download list, because you already have it:\n ") + QString::fromUtf8(fi.fname.c_str()), QMessageBox::Critical, QMessageBox::Ok, 0, 0); QMessageBox mb(QObject::tr("File Request canceled"), QObject::tr("The following has not been added to your download list, because you already have it:")+"\n " + QString::fromUtf8(fi.fname.c_str()), QMessageBox::Critical, QMessageBox::Ok, 0, 0);
mb.exec(); mb.exec();
} }
} }

8
retroshare-gui/src/gui/settings/ChatPage.cpp
View File

@ -290,12 +290,12 @@ ChatPage::load()
for() for()
{ {
QListWidgetItem *item = new QListWidgetItem; QListWidgetItem *item = new QListWidgetItem;
item->setData(Qt::DisplayRole,tr("Private chat invite from ")+QString::fromUtf8(detail.name.c_str())) ; item->setData(Qt::DisplayRole,tr("Private chat invite from")+" "+QString::fromUtf8(detail.name.c_str())) ;
QString tt ; QString tt ;
tt += tr("Name : ") + QString::fromUtf8(detail.name.c_str()) ; tt += tr("Name :")+" " + QString::fromUtf8(detail.name.c_str()) ;
tt += "\n" + tr("PGP id : ") + QString::fromStdString(invites[i].destination_pgp_id.toStdString()) ; tt += "\n" + tr("PGP id :")+" " + QString::fromStdString(invites[i].destination_pgp_id.toStdString()) ;
tt += "\n" + tr("Valid until : ") + QDateTime::fromTime_t(invites[i].time_of_validity).toString() ; tt += "\n" + tr("Valid until :")+" " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() ;
item->setData(Qt::UserRole,QString::fromStdString(invites[i].pid.toStdString())) ; item->setData(Qt::UserRole,QString::fromStdString(invites[i].pid.toStdString())) ;
item->setToolTip(tt) ; item->setToolTip(tt) ;

6
retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
View File

@ -435,10 +435,10 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
rsServiceControl->getServicePermissions(service_ids[n_col_selected],service_perms) ; rsServiceControl->getServicePermissions(service_ids[n_col_selected],service_perms) ;
QString service_name = tr("Service name: ")+QString::fromUtf8(service_perms.mServiceName.c_str()) ; QString service_name = tr("Service name:")+" "+QString::fromUtf8(service_perms.mServiceName.c_str()) ;
QString service_default = service_perms.mDefaultAllowed?tr("Allowed by default"):tr("Denied by default"); QString service_default = service_perms.mDefaultAllowed?tr("Allowed by default"):tr("Denied by default");
QString peer_name = tr("Peer name: ") + names[n_row_selected] ; QString peer_name = tr("Peer name:")+" " + names[n_row_selected] ;
QString peer_id = tr("Peer Id: ")+QString::fromStdString(_current_peer_id.toStdString()) ; QString peer_id = tr("Peer Id:")+" "+QString::fromStdString(_current_peer_id.toStdString()) ;
RsPeerServiceInfo pserv_info ; RsPeerServiceInfo pserv_info ;
rsServiceControl->getServicesAllowed(_current_peer_id,pserv_info) ; rsServiceControl->getServicesAllowed(_current_peer_id,pserv_info) ;

2
retroshare-gui/src/gui/settings/rsettingswin.cpp
View File

@ -216,7 +216,7 @@ RSettingsWin::saveChanges()
/* Show the user what went wrong */ /* Show the user what went wrong */
QMessageBox::warning(this, QMessageBox::warning(this,
tr("Error Saving Configuration on page ")+QString::number(i), errmsg, tr("Error Saving Configuration on page")+" "+QString::number(i), errmsg,
QMessageBox::Ok, QMessageBox::NoButton); QMessageBox::Ok, QMessageBox::NoButton);
/* Don't process the rest of the pages */ /* Don't process the rest of the pages */

4
retroshare-gui/src/gui/statistics/DhtWindow.cpp
View File

@ -374,10 +374,10 @@ void DhtWindow::updateNetPeers()
cpmstr = tr("Direct"); cpmstr = tr("Direct");
break; break;
case RSDHT_TOU_MODE_PROXY: case RSDHT_TOU_MODE_PROXY:
cpmstr = tr("Proxy VIA ") + QString::fromStdString(status.mPeerConnectProxyId); cpmstr = tr("Proxy VIA")+" " + QString::fromStdString(status.mPeerConnectProxyId);
break; break;
case RSDHT_TOU_MODE_RELAY: case RSDHT_TOU_MODE_RELAY:
cpmstr = tr("Relay VIA ") + QString::fromStdString(status.mPeerConnectProxyId); cpmstr = tr("Relay VIA")+" " + QString::fromStdString(status.mPeerConnectProxyId);
break; break;
default: default:
case RSDHT_TOU_MODE_NONE: case RSDHT_TOU_MODE_NONE:

2
retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
View File

@ -174,7 +174,7 @@ void GlobalRouterStatisticsWidget::updateContent()
{ {
QString packet_string ; QString packet_string ;
packet_string += QString::fromStdString(it->second.authentication_key.toStdString()) ; packet_string += QString::fromStdString(it->second.authentication_key.toStdString()) ;
packet_string += tr(" : Service ID = ")+QString::number(it->second.service_id,16) ; packet_string += tr(" : Service ID =")+" "+QString::number(it->second.service_id,16) ;
packet_string += " \""+QString::fromUtf8(it->second.description_string.c_str()) + "\"" ; packet_string += " \""+QString::fromUtf8(it->second.description_string.c_str()) + "\"" ;
painter.drawText(ox+2*cellx,oy+celly,packet_string ) ; oy += celly ; painter.drawText(ox+2*cellx,oy+celly,packet_string ) ; oy += celly ;

4
retroshare-gui/src/gui/statistics/OutQueueStatistics.cpp
View File

@ -81,8 +81,8 @@ void OutQueueStatisticsWidget::updateStatistics(OutQueueStatistics& stats)
by_service_string += QString::number(it->second) + " (" + serviceName(it->first) + ") " ; by_service_string += QString::number(it->second) + " (" + serviceName(it->first) + ") " ;
painter.drawText(ox,oy+celly,tr("Outqueue statistics")+":") ; oy += celly*2 ; painter.drawText(ox,oy+celly,tr("Outqueue statistics")+":") ; oy += celly*2 ;
painter.drawText(ox+2*cellx,oy+celly,tr("By priority: ") + by_priority_string); oy += celly ; painter.drawText(ox+2*cellx,oy+celly,tr("By priority:")+" " + by_priority_string); oy += celly ;
painter.drawText(ox+2*cellx,oy+celly,tr("By service : ") + by_service_string); oy += celly ; painter.drawText(ox+2*cellx,oy+celly,tr("By service :")+" " + by_service_string); oy += celly ;
oy += celly ; oy += celly ;

2
retroshare-gui/src/gui/statusbar/ratesstatus.cpp
View File

@ -39,7 +39,7 @@ RatesStatus::RatesStatus(QWidget *parent)
// iconLabel doesn't change over time, so we didn't need a minimum size // iconLabel doesn't change over time, so we didn't need a minimum size
hbox->addWidget(iconLabel); hbox->addWidget(iconLabel);
statusRates = new QLabel( tr("<strong>Down:</strong> 0.00 (kB/s) | <strong>Up:</strong> 0.00 (kB/s) "), this ); statusRates = new QLabel( tr("<strong>Down:</strong> 0.00 (kB/s) | <strong>Up:</strong> 0.00 (kB/s)")+" ", this );
// statusPeers->setMinimumSize( statusPeers->frameSize().width() + 0, 0 ); // statusPeers->setMinimumSize( statusPeers->frameSize().width() + 0, 0 );
hbox->addWidget(statusRates); hbox->addWidget(statusRates);

2
retroshare-gui/src/gui/unfinished/StatisticDialog.cpp
View File

@ -114,7 +114,7 @@ void StatisticDialog::timerEvent( QTimerEvent * )
QTime elapsed; QTime elapsed;
elapsed= QTime(0,0,0).addMSecs(UpTime.elapsed()); elapsed= QTime(0,0,0).addMSecs(UpTime.elapsed());
if( UpDays>0) if( UpDays>0)
model->setData(ind1,QString(tr("%1 days ")).arg(UpDays)+elapsed.toString("hh:mm:ss")); model->setData(ind1,QString(tr("%1 days")).arg(UpDays)+" "+elapsed.toString("hh:mm:ss"));
else else
model->setData(ind1,elapsed.toString("hh:mm:ss")); model->setData(ind1,elapsed.toString("hh:mm:ss"));

6
retroshare-gui/src/rshare.cpp
View File

@ -312,20 +312,20 @@ Rshare::validateArguments(QString &errmsg)
/* Check for a language that Retroshare recognizes. */ /* Check for a language that Retroshare recognizes. */
if (_args.contains(ARG_LANGUAGE) && if (_args.contains(ARG_LANGUAGE) &&
!LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) { !LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) {
errmsg = tr("Invalid language code specified: ") + _args.value(ARG_LANGUAGE); errmsg = tr("Invalid language code specified:")+" " + _args.value(ARG_LANGUAGE);
return false; return false;
} }
/* Check for a valid GUI style */ /* Check for a valid GUI style */
if (_args.contains(ARG_GUISTYLE) && if (_args.contains(ARG_GUISTYLE) &&
!QStyleFactory::keys().contains(_args.value(ARG_GUISTYLE), !QStyleFactory::keys().contains(_args.value(ARG_GUISTYLE),
Qt::CaseInsensitive)) { Qt::CaseInsensitive)) {
errmsg = tr("Invalid GUI style specified: ") + _args.value(ARG_GUISTYLE); errmsg = tr("Invalid GUI style specified:")+" " + _args.value(ARG_GUISTYLE);
return false; return false;
} }
/* Check for a valid log level */ /* Check for a valid log level */
if (_args.contains(ARG_LOGLEVEL) && if (_args.contains(ARG_LOGLEVEL) &&
!Log::logLevels().contains(_args.value(ARG_LOGLEVEL))) { !Log::logLevels().contains(_args.value(ARG_LOGLEVEL))) {
errmsg = tr("Invalid log level specified: ") + _args.value(ARG_LOGLEVEL); errmsg = tr("Invalid log level specified:")+" " + _args.value(ARG_LOGLEVEL);
return false; return false;
} }
/* Check for a writable log file */ /* Check for a writable log file */