diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 75edb25e0..55af31ad6 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -149,13 +149,13 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) #if QT_VERSION >= 0x040700 ui.email_input->setPlaceholderText(tr("[Optional] Visible to your friends, and friends of friends.")) ; - ui.location_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...")) ; + ui.node_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...")) ; ui.name_input->setPlaceholderText(tr("[Required] Visible to your friends, and friends of friends.")); ui.password_input->setPlaceholderText(tr("[Required] This password protects your PGP key.")); ui.password_input_2->setPlaceholderText(tr("[Required] Type the same password again here.")); #endif - ui.location_input->setToolTip(tr("Put a meaningful location. ex : home, laptop, etc. \nThis field will be used to differentiate different installations with\nthe same identity (PGP key).")) ; + ui.node_input->setToolTip(tr("Enter a meaningful node description. e.g. : home, laptop, etc. \nThis field will be used to differentiate different installations with\nthe same identity (PGP key).")) ; ui.email_input->hide() ; ui.email_label->hide() ; @@ -199,9 +199,9 @@ void GenCertDialog::init() if (foundGPGKeys) { ui.no_gpg_key_label->hide(); ui.new_gpg_key_checkbox->setChecked(false); - setWindowTitle(tr("Create new Location")); - ui.genButton->setText(tr("Generate new Location")); - ui.headerFrame->setHeaderText(tr("Create a new Location")); + setWindowTitle(tr("Create new node")); + ui.genButton->setText(tr("Generate new node")); + ui.headerFrame->setHeaderText(tr("Create a new node")); genNewGPGKey = false; } else { ui.no_gpg_key_label->setVisible(!mOnlyGenerateIdentity); @@ -214,14 +214,15 @@ void GenCertDialog::init() } QString text = ui.header_label->text() + "\n"; + text += tr("You can create a new identity with this form."); if (mOnlyGenerateIdentity) { ui.new_gpg_key_checkbox->setChecked(true); ui.new_gpg_key_checkbox->hide(); ui.genprofileinfo_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 PGP key pair), from the list below, or create a new one with this form."); + text += "\n"; + text += tr("Alternatively you can use an existing identity. Just uncheck \"Create a new identity\""); } ui.header_label->setText(text); @@ -252,9 +253,10 @@ void GenCertDialog::newGPGKeyGenUiSetup() { ui.genPGPuser->hide(); ui.importIdentity_PB->hide() ; ui.exportIdentity_PB->hide(); - setWindowTitle(tr("Create new Identity")); - ui.genButton->setText(tr("Generate new Identity")); - ui.headerFrame->setHeaderText(tr("Create a new Identity")); + setWindowTitle(tr("Create new identity")); + ui.genButton->setText(tr("Generate new identity")); + ui.headerFrame->setHeaderText(tr("Create a new identity")); + ui.genButton->setVisible(true); ui.genprofileinfo_label->hide(); ui.header_label->show(); } else { @@ -272,9 +274,10 @@ void GenCertDialog::newGPGKeyGenUiSetup() { ui.importIdentity_PB->setVisible(!mOnlyGenerateIdentity); ui.exportIdentity_PB->setVisible(!mOnlyGenerateIdentity); ui.exportIdentity_PB->setEnabled(ui.genPGPuser->count() != 0); - setWindowTitle(tr("Create new Location")); - ui.genButton->setText(tr("Generate new Location")); - ui.headerFrame->setHeaderText(tr("Create a new Location")); + setWindowTitle(tr("Create new node")); + ui.genButton->setText(tr("Generate new node")); + ui.genButton->setVisible(ui.genPGPuser->count() != 0); + ui.headerFrame->setHeaderText(tr("Create a new node")); ui.genprofileinfo_label->show(); ui.header_label->hide(); } @@ -304,7 +307,7 @@ void GenCertDialog::hiddenUiSetup() void GenCertDialog::exportIdentity() { - QString fname = QFileDialog::getSaveFileName(this,tr("Export Identity"), "",tr("RetroShare Identity files (*.asc)")) ; + QString fname = QFileDialog::getSaveFileName(this,tr("Export identity"), "",tr("RetroShare identity files (*.asc)")) ; if(fname.isNull()) return ; @@ -320,7 +323,7 @@ void GenCertDialog::exportIdentity() void GenCertDialog::importIdentity() { - QString fname = QFileDialog::getOpenFileName(this,tr("Export Identity"), "",tr("RetroShare Identity files (*.asc)")) ; + QString fname = QFileDialog::getOpenFileName(this,tr("Import identity"), "",tr("RetroShare identity files (*.asc)")) ; if(fname.isNull()) return ; @@ -340,7 +343,7 @@ void GenCertDialog::importIdentity() RsAccounts::GetPGPLoginDetails(gpg_id, name, email); std::cerr << "Adding PGPUser: " << name << " id: " << gpg_id << std::endl; - QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromStdString(name)+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new location.")) ; + QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromStdString(name)+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new node.")) ; } init() ; @@ -349,7 +352,7 @@ void GenCertDialog::importIdentity() void GenCertDialog::genPerson() { /* Check the data from the GUI. */ - std::string genLoc = ui.location_input->text().toUtf8().constData(); + std::string genLoc = ui.node_input->text().toUtf8().constData(); RsPgpId PGPId; bool isHiddenLoc = false; @@ -361,8 +364,8 @@ void GenCertDialog::genPerson() { /* Message Dialog */ QMessageBox::warning(this, - tr("Invalid Hidden Location"), - tr("Please put in a valid address of the form: 31769173498.onion:7800"), + tr("Invalid hidden node"), + tr("Please enter a valid address of the form: 31769173498.onion:7800"), QMessageBox::Ok); return; } @@ -373,8 +376,8 @@ void GenCertDialog::genPerson() if (genLoc.length() < 3) { /* Message Dialog */ QMessageBox::warning(this, - tr("Generate PGP key Failure"), - tr("Location field is required with a minimum of 3 characters"), + tr("Generate PGP key failure"), + tr("Node field is required with a minimum of 3 characters"), QMessageBox::Ok); return; } @@ -383,8 +386,8 @@ void GenCertDialog::genPerson() { /* Message Dialog */ QMessageBox::warning(this, - "Generate ID Failure", - "Missing PGP Certificate", + "Generate ID failure", + "Missing PGP certificate", QMessageBox::Ok); return; } @@ -394,7 +397,7 @@ void GenCertDialog::genPerson() if (ui.password_input->text().length() < 3 || ui.name_input->text().length() < 3 || genLoc.length() < 3) { /* Message Dialog */ QMessageBox::warning(this, - tr("Generate PGP key Failure"), + tr("Generate PGP key failure"), tr("All fields are required with a minimum of 3 characters"), QMessageBox::Ok); return; @@ -403,7 +406,7 @@ void GenCertDialog::genPerson() if(ui.password_input->text() != ui.password_input_2->text()) { QMessageBox::warning(this, - tr("Generate PGP key Failure"), + tr("Generate PGP key failure"), tr("Passwords do not match"), QMessageBox::Ok); return; @@ -423,8 +426,8 @@ void GenCertDialog::genPerson() ui.password_input->hide(); ui.genPGPuserlabel->hide(); ui.genPGPuser->hide(); - ui.location_label->hide(); - ui.location_input->hide(); + ui.node_label->hide(); + ui.node_input->hide(); ui.genButton->hide(); ui.importIdentity_PB->hide(); ui.genprofileinfo_label->hide(); @@ -464,9 +467,9 @@ void GenCertDialog::genPerson() { /* Message Dialog */ QMessageBox::warning(this, - tr("Generate ID Failure"), - tr("Failed to Generate your new Certificate, maybe PGP password is wrong!"), - QMessageBox::Ok); - reject(); - } -} + tr("Generate ID failure"), + tr("Failed to generate your new certificate, maybe PGP password is wrong!"), + QMessageBox::Ok); + reject(); + } +} diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui index fd1b97093..a9da227ee 100644 --- a/retroshare-gui/src/gui/GenCertDialog.ui +++ b/retroshare-gui/src/gui/GenCertDialog.ui @@ -3,13 +3,13 @@ GenCertDialog - - 0 - 0 - 784 - 509 - - + + 0 + 0 + 784 + 509 + + Create new Profile @@ -58,7 +58,7 @@ - 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. + You can create and run Retroshare nodes on different computers using the same identity. To do so just export the selected identity, import it on the other computer and create a new node with it. true @@ -130,7 +130,7 @@ Your profile is associated with a PGP key - Create a Hidden Location. + Create a hidden node. @@ -216,7 +216,7 @@ - This Password is for PGP + This password is for PGP Password @@ -226,7 +226,7 @@ - This Password is for PGP + This password is for PGP Password (check) @@ -234,16 +234,16 @@ - + - Location + Node - Tor Address + TOR address @@ -313,7 +313,7 @@ anonymous, you can use a fake email. - + 64 @@ -462,22 +462,22 @@ anonymous, you can use a fake email. - genPGPuser - name_input - email_input - password_input - password_input_2 - location_input - hiddenaddr_input - hiddenport_spinBox - genButton - new_gpg_key_checkbox - hidden_checkbox - importIdentity_PB - exportIdentity_PB - - - + genPGPuser + name_input + email_input + password_input + password_input_2 + node_input + hiddenaddr_input + hiddenport_spinBox + genButton + new_gpg_key_checkbox + hidden_checkbox + importIdentity_PB + exportIdentity_PB + + + diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index 8eac01340..ced755360 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -219,7 +219,7 @@ void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ ) contextMnu->addAction(QIcon(IMAGE_MAKEFRIEND), tr("Make friend"), this, SLOT(makeFriend())); } if(peer_id == rsPeers->getGPGOwnId()) - contextMnu->addAction(QIcon(IMAGE_EXPORT), tr("Export/create a new location"), this, SLOT(on_actionExportKey_activated())); + contextMnu->addAction(QIcon(IMAGE_EXPORT), tr("Export/create a new node"), this, SLOT(on_actionExportKey_activated())); contextMnu->addAction(QIcon(IMAGE_PEERDETAILS), tr("Peer details..."), this, SLOT(peerdetails())); //contextMnu->addAction(QIcon(IMAGE_MESSAGE), tr("Send Message"), this, SLOT(sendDistantMessage())); diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp index 3ad826f3f..62213c49f 100644 --- a/retroshare-gui/src/gui/StartDialog.cpp +++ b/retroshare-gui/src/gui/StartDialog.cpp @@ -58,9 +58,9 @@ StartDialog::StartDialog(QWidget *parent) { const QVariant & userData = QVariant(QString::fromStdString((*it).toStdString())); RsPgpId gpgid ; - std::string name, email, location; - RsAccounts::GetAccountDetails(*it, gpgid, name, email, location); - QString accountName = QString::fromUtf8(name.c_str()) + " (" + QString::fromStdString(gpgid.toStdString()).right(8) + ") - " + QString::fromUtf8(location.c_str()); + std::string name, email, node; + RsAccounts::GetAccountDetails(*it, gpgid, name, email, node); + QString accountName = QString::fromUtf8(name.c_str()) + " (" + QString::fromStdString(gpgid.toStdString()).right(8) + ") - " + QString::fromUtf8(node.c_str()); ui.loadName->addItem(accountName, userData); if (preferedId == *it) @@ -120,12 +120,12 @@ void StartDialog::notSecureWarning() /* some error msg */ if (ui.autologin_checkbox->isChecked()) #ifdef UBUNTU - QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); + QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); #else #ifdef __APPLE__ - QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your location) will be stored encrypted in your Keychain. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); + QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Keychain. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); #else - QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP password will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); + QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP password will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); #endif #endif } diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui index a467008dc..3f2c9a679 100644 --- a/retroshare-gui/src/gui/StartDialog.ui +++ b/retroshare-gui/src/gui/StartDialog.ui @@ -286,7 +286,7 @@ The current identities/locations will not be affected. <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">Manage profiles and locations...</span></a></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">Manage profiles and nodes...</span></a></p></body></html> diff --git a/retroshare-gui/src/gui/chat/ChatDialog.cpp b/retroshare-gui/src/gui/chat/ChatDialog.cpp index a8763faf0..f9f3a345f 100644 --- a/retroshare-gui/src/gui/chat/ChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatDialog.cpp @@ -255,7 +255,7 @@ void ChatDialog::init(ChatId id, const QString &title) } // more than one ssl ids online or all offline - QMessageBox mb(QMessageBox::Warning, "RetroShare", tr("Your friend has more than one locations.\nPlease choose one of it to chat with."), QMessageBox::Ok); + QMessageBox mb(QMessageBox::Warning, "RetroShare", tr("Your friend has more than one nodes.\nPlease choose one of it to chat with."), QMessageBox::Ok); mb.exec(); } diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp index 54d9550aa..344ac3bdc 100644 --- a/retroshare-gui/src/gui/common/FriendList.cpp +++ b/retroshare-gui/src/gui/common/FriendList.cpp @@ -358,7 +358,7 @@ void FriendList::peerTreeWidgetCostumPopupMenu() break; case TYPE_SSL: //this is a SSL key - textLabel->setText("" + tr("Location") + ""); + textLabel->setText("" + tr("Node") + ""); break; } @@ -418,7 +418,7 @@ void FriendList::peerTreeWidgetCostumPopupMenu() contextMnu.addAction(QIcon(IMAGE_DENYFRIEND), tr("Deny Friend"), this, SLOT(removefriend())); } else { //this is a SSL key - contextMnu.addAction(QIcon(IMAGE_REMOVEFRIEND), tr("Remove Friend Location"), this, SLOT(removefriend())); + contextMnu.addAction(QIcon(IMAGE_REMOVEFRIEND), tr("Remove Friend Node"), this, SLOT(removefriend())); } if (mShowGroups && type == TYPE_GPG) { @@ -573,7 +573,7 @@ void FriendList::updateAvatar(const QString& id) /** * Get the list of peers from the RsIface. - * Adds all friend gpg ids, with their locations as children to the peerTreeWidget. + * Adds all friend gpg ids, with their nodes as children to the peerTreeWidget. * If enabled, peers are sorted in their associated groups. * Groups are only updated, when groupsHasChanged is true. */ @@ -612,7 +612,7 @@ void FriendList::insertPeers() std::list::iterator gpgIt; rsPeers->getGPGAcceptedList(gpgFriends); - //add own gpg id, if we have more than on location (ssl client) + //add own gpg id, if we have more than on node (ssl client) std::list ownSslContacts; RsPgpId ownId = rsPeers->getGPGOwnId(); rsPeers->getAssociatedSSLIds(ownId, ownSslContacts); @@ -944,7 +944,7 @@ void FriendList::insertPeers() sslItem->setToolTip(COLUMN_NAME, ""); } - // sort location + // sort node sslItem->setData(COLUMN_STATE, ROLE_SORT, sText); /* last contact */ diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp index 4a1d4c6b0..ea08a90a4 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp @@ -620,7 +620,7 @@ void FriendSelectionWidget::peerStatusChanged(const QString& peerId, int status) gpgId = QString::fromStdString(detail.gpg_id.toStdString()); if (status == (int) RS_STATUS_OFFLINE) { - /* try other locations */ + /* try other nodes */ std::list sslIds; rsPeers->getAssociatedSSLIds(detail.gpg_id, sslIds); @@ -637,7 +637,7 @@ void FriendSelectionWidget::peerStatusChanged(const QString& peerId, int status) } } } else { - /* one location is online */ + /* one node is online */ gpgStatus = RS_STATUS_ONLINE; } } diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp index 02c4086cc..8138975c4 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp @@ -112,7 +112,7 @@ QString ConnectFriendWizard::getErrorString(uint32_t error_code) switch(error_code) { case CERTIFICATE_PARSING_ERROR_SIZE_ERROR: return tr("Abnormal size read is bigger than memory block.") ; - case CERTIFICATE_PARSING_ERROR_INVALID_LOCATION_ID: return tr("Invalid location id.") ; + case CERTIFICATE_PARSING_ERROR_INVALID_LOCATION_ID: return tr("Invalid node id.") ; case CERTIFICATE_PARSING_ERROR_INVALID_EXTERNAL_IP: return tr("Invalid external IP.") ; case CERTIFICATE_PARSING_ERROR_INVALID_LOCAL_IP: return tr("Invalid local IP.") ; case CERTIFICATE_PARSING_ERROR_INVALID_CHECKSUM_SECTION: return tr("Invalid checksum section.") ; @@ -355,7 +355,7 @@ void ConnectFriendWizard::initializePage(int id) } } - ui->locationEdit->setText(loc); + ui->nodeEdit->setText(loc); ui->signersEdit->setPlainText(ts); fillGroups(this, ui->groupComboBox, groupId); @@ -412,7 +412,7 @@ void ConnectFriendWizard::initializePage(int id) } } - ui->fr_locationEdit->setText(loc); + ui->fr_nodeEdit->setText(loc); ui->fr_label->setText(tr("You have a friend request from") + " " + QString::fromUtf8(peerDetails.name.c_str())); @@ -694,7 +694,7 @@ void ConnectFriendWizard::accept() runProgressDialog = true; if (!peerDetails.location.empty()) { - std::cerr << "ConnectFriendWizard::accept() : setting peerLocation." << std::endl; + std::cerr << "ConnectFriendWizard::accept() : setting peer node." << std::endl; rsPeers->setLocation(peerDetails.id, peerDetails.location); } diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui index c7b6c4c78..8c0c95f44 100644 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui @@ -597,14 +597,14 @@ - + Location: - + Location @@ -901,14 +901,14 @@ - + Location: - + Location diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp b/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp index ad5703aa8..aae2af466 100755 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp @@ -782,7 +782,7 @@ void ConnectProgressDialog::sayUdpDenied() message += "\n\n"; message += tr("Please contact them to add your Full Certificate"); message += "\n"; - message += tr("They need a Certificate + Location for UDP connections to succeed"); + message += tr("They need a Certificate + Node for UDP connections to succeed"); message += "\n\n"; message += tr("Your Retroshare Node is configured Okay"); diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.cpp b/retroshare-gui/src/gui/feeds/SecurityItem.cpp index 1700a8117..5ba71da7a 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityItem.cpp @@ -130,7 +130,7 @@ void SecurityItem::updateItemStatic() requestLabel->hide(); break; case RS_FEED_ITEM_SEC_MISSING_CERTIFICATE: - title = tr("Peer/location not in friendlist (PGP id=")+QString::fromStdString(mGpgId.toStdString())+")"; + title = tr("Peer/node not in friendlist (PGP id=")+QString::fromStdString(mGpgId.toStdString())+")"; avatar->setDefaultAvatar(":images/avatar_request_unknown.png"); requestLabel->show(); break; diff --git a/retroshare-gui/src/gui/profile/ProfileManager.cpp b/retroshare-gui/src/gui/profile/ProfileManager.cpp index b9240005e..77a6c2b0b 100644 --- a/retroshare-gui/src/gui/profile/ProfileManager.cpp +++ b/retroshare-gui/src/gui/profile/ProfileManager.cpp @@ -167,7 +167,7 @@ void ProfileManager::importIdentity() RsAccounts::GetPGPLoginDetails(gpg_id, name, email); std::cerr << "Adding PGPUser: " << name << " id: " << gpg_id << std::endl; - QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromUtf8(name.c_str())+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new location.")) ; + QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromUtf8(name.c_str())+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new node.")) ; } fillIdentities(); diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 3ba5abfd4..c70c70e9e 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -55,7 +55,7 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags) #ifdef Q_WS_WIN #endif - connect(ui.createNewLocation_PB,SIGNAL(clicked()), this, SLOT(profilemanager())); + connect(ui.createNewNode_PB,SIGNAL(clicked()), this, SLOT(profilemanager())); ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime())); } diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index 51f9d3677..c6c694615 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -482,9 +482,9 @@ - + - Create new location... + Create new node... diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp index 9848d8883..394ffb7ca 100644 --- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp +++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp @@ -370,7 +370,7 @@ void ServicePermissionsPage::tableItemChanged ( QTableWidgetItem * item ) { std::cerr << "ServicePermissionsPage::tableItemChanged()"; std::cerr << std::endl; - std::cerr << "\t Location: Row: " << item->row() << " Column: " << item->column(); + std::cerr << "\t Node: Row: " << item->row() << " Column: " << item->column(); std::cerr << std::endl; std::cerr << "\t IsChecked: " << (Qt::Checked == item->checkState()); std::cerr << std::endl; diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp index 658182ef2..3cef92e84 100644 --- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp +++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp @@ -132,7 +132,7 @@ void GlobalRouterStatisticsWidget::updateContent() // Routing matrix // Key [][][][][][][][][][] // - // -> each [] shows a square (one per friend location) that is the routing probabilities for all connected friends + // -> each [] shows a square (one per friend node) that is the routing probabilities for all connected friends // computed using the "computeRoutingProbabilitites()" method. // // Own key ids diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index e968d6811..3972bfe57 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -725,12 +725,12 @@ p, li { white-space: pre-wrap; } ChatDialog - Your friend has more than one locations. -Please choose one of it to chat with. + Talking to - Talking to + Your friend has more than one nodes. +Please choose one of it to chat with. @@ -2123,10 +2123,6 @@ Some services (Discovery, anonymous routing) can be switched off globally, which Abnormal size read is bigger than memory block. - - Invalid location id. - - Invalid external IP. @@ -2366,6 +2362,10 @@ even if you don't make friends. Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible. + + Invalid node id. + + ConnectProgressDialog @@ -2657,10 +2657,6 @@ even if you don't make friends. Please contact them to add your Full Certificate - - They need a Certificate + Location for UDP connections to succeed - - We Cannot find your Friend. @@ -2745,6 +2741,10 @@ p, li { white-space: pre-wrap; } Retroshare cannot connect without this information + + They need a Certificate + Node for UDP connections to succeed + + CreateCircleDialog @@ -3259,11 +3259,11 @@ Do you want to reject this message? - Create new location... + Node - Node + Create new node... @@ -4229,10 +4229,6 @@ you plug it in. Friend - - Location - - Message Group @@ -4269,10 +4265,6 @@ you plug it in. Deny Friend - - Remove Friend Location - - Add to group @@ -4345,6 +4337,14 @@ you plug it in. Sort by + + Node + + + + Remove Friend Node + + FriendRequestToaster @@ -4394,38 +4394,6 @@ you plug it in. Broadcast - - Bold - - - - Underline - - - - Italic - - - - Font - - - - Text Color - - - - Attach File - - - - Send - - - - Messages entered here are sent to all connected friends - - Clear Chat History @@ -4486,34 +4454,6 @@ you plug it in. Reset font to default - - Paste RetroShare Link - - - - is typing... - - - - New group chat - - - - Do you really want to physically delete the history? - - - - Add Extra File - - - - Save as... - - - - Text File (*.txt );;All Files (*) - - Keyring @@ -4522,14 +4462,6 @@ you plug it in. Retroshare broadcast chat: messages are sent to all connected friends. - - Attach a Picture - - - - Load Picture File - - Network @@ -4553,10 +4485,6 @@ you plug it in. Create new Profile - - 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. - - 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. @@ -4583,10 +4511,6 @@ of your friends. This information is required by PGP, but to stay anonymous, you can use a fake email. - - This Password is for PGP - - Password @@ -4595,10 +4519,6 @@ anonymous, you can use a fake email. Put a strong password here. This password protects your PGP key. - - Location - - Create new identity @@ -4647,18 +4567,6 @@ anonymous, you can use a fake email. [Required] This password protects your PGP key. - - Create new Location - - - - Generate new Location - - - - Create a new Location - - Create new Identity @@ -4671,18 +4579,6 @@ anonymous, you can use a fake email. You can create a new identity with this form. - - You can use an existing identity (i.e. a PGP key pair), from the list below, or create a new one with this form. - - - - Export Identity - - - - RetroShare Identity files (*.asc) - - Identity saved @@ -4719,18 +4615,6 @@ and use the import button to load it Your identity was imported successfully: - - You can use it now to create a new location. - - - - Generate PGP key Failure - - - - Location field is required with a minimum of 3 characters - - All fields are required with a minimum of 3 characters @@ -4741,14 +4625,6 @@ and use the import button to load it Fill in your PGP password when asked, to sign your new key. - - Generate ID Failure - - - - Failed to Generate your new Certificate, maybe PGP password is wrong! - - Password (check) @@ -4761,24 +4637,10 @@ Fill in your PGP password when asked, to sign your new key. [Required] Type the same password again here. - - Put a meaningful location. ex : home, laptop, etc. -This field will be used to differentiate different installations with -the same identity (PGP key). - - Passwords do not match - - Create a Hidden Location. - - - - Tor Address - - Port @@ -4788,11 +4650,89 @@ the same identity (PGP key). - Invalid Hidden Location + You can create and run Retroshare nodes on different computers using the same identity. To do so just export the selected identity, import it on the other computer and create a new node with it. - Please put in a valid address of the form: 31769173498.onion:7800 + Create a hidden node. + + + + This password is for PGP + + + + Node + + + + TOR address + + + + Enter a meaningful node description. e.g. : home, laptop, etc. +This field will be used to differentiate different installations with +the same identity (PGP key). + + + + Create new node + + + + Generate new node + + + + Create a new node + + + + Alternatively you can use an existing identity. Just uncheck "Create a new identity" + + + + Generate new identity + + + + Export identity + + + + RetroShare identity files (*.asc) + + + + Import identity + + + + You can use it now to create a new node. + + + + Invalid hidden node + + + + Please enter a valid address of the form: 31769173498.onion:7800 + + + + Generate PGP key failure + + + + Node field is required with a minimum of 3 characters + + + + Generate ID failure + + + + Failed to generate your new certificate, maybe PGP password is wrong! @@ -8768,7 +8708,7 @@ Right-click and select 'make friend' to be able to connect. - Export/create a new location + Export/create a new node @@ -10061,10 +10001,6 @@ and use the import button to load it Your identity was imported successfully: - - You can use it now to create a new location. - - Select Trusted Friend @@ -10093,6 +10029,10 @@ p, li { white-space: pre-wrap; } Export selected key + + You can use it now to create a new node. + + ProfileWidget @@ -10437,14 +10377,6 @@ Characters <b>",|,/,\,&lt;,&gt;,*,?</b> will be replace - - You appear to have locations associated to DSA keys: - - - - DSA keys are not yet supported by this version of RetroShare. All these locations will be unusable. We're very sorry for that. - - 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. @@ -10572,6 +10504,14 @@ Reported error is: Data forward + + You appear to have nodes associated to DSA keys: + + + + DSA keys are not yet supported by this version of RetroShare. All these nodes will be unusable. We're very sorry for that. + + QuickStartWizard @@ -11562,11 +11502,11 @@ Reducing image to %1x%2 pixels? - Peer/location not in friendlist (PGP id= + Send Message - Send Message + Peer/node not in friendlist (PGP id= @@ -12296,14 +12236,6 @@ adding locations to an existing profile. The current identities/locations will not be affected. - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">Manage profiles and locations...</span></a></p></body></html> - - Load Person Failure @@ -12317,7 +12249,15 @@ p, li { white-space: pre-wrap; } - The password to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">Manage profiles and nodes...</span></a></p></body></html> + + + + The password to your SSL certificate (your node) will be stored encrypted in your Gnome Keyring. Your PGP passwd will not be stored. @@ -12325,7 +12265,7 @@ This choice can be reverted in settings. - The password to your SSL certificate (your location) will be stored encrypted in your Keychain. + The password to your SSL certificate (your node) will be stored encrypted in your Keychain. Your PGP passwd will not be stored. @@ -12333,7 +12273,7 @@ This choice can be reverted in settings. - The password to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. + The password to your SSL certificate (your node) will be stored encrypted in the keys/help.dta file. This is not secure. Your PGP password will not be stored. diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index abab0ed04..b0843273c 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -73,7 +73,7 @@ static void displayWarningAboutDSAKeys() QMessageBox msgBox; - QString txt = QObject::tr("You appear to have locations associated to DSA keys:"); + QString txt = QObject::tr("You appear to have nodes associated to DSA keys:"); txt += "
    " ; for(std::map >::const_iterator it(unsupported_keys.begin());it!=unsupported_keys.end();++it) { @@ -89,7 +89,7 @@ static void displayWarningAboutDSAKeys() txt += "
" ; msgBox.setText(txt) ; - msgBox.setInformativeText(QObject::tr("DSA keys are not yet supported by this version of RetroShare. All these locations will be unusable. We're very sorry for that.")); + msgBox.setInformativeText(QObject::tr("DSA keys are not yet supported by this version of RetroShare. All these nodes will be unusable. We're very sorry for that.")); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setWindowIcon(QIcon(":/images/logo/logo_32.png"));