Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 16:39:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed "location" to "node" in gui (Patch from Henry)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-12-30 11:11:08 +00:00
parent 1b77e09684
commit 530fcab61d
19 changed files with 228 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -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();
}
}

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

@ -3,13 +3,13 @@
<class>GenCertDialog</class>
<widget class="QDialog" name="GenCertDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>784</width>
<height>509</height>
</rect>
</property>
<rect>
<x>0</x>
<y>0</y>
<width>784</width>
<height>509</height>
</rect>
</property>
<property name="windowTitle">
<string>Create new Profile</string>
</property>
@ -58,7 +58,7 @@
</font>
</property>
<property name="text">
<string>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.</string>
<string>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.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -130,7 +130,7 @@
<string>Your profile is associated with a PGP key</string>
</property>
<property name="text">
<string>Create a Hidden Location.</string>
<string>Create a hidden node.</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
@ -216,7 +216,7 @@
<item>
<widget class="QLabel" name="password_label">
<property name="toolTip">
<string>This Password is for PGP</string>
<string>This password is for PGP</string>
</property>
<property name="text">
<string>Password</string>
@ -226,7 +226,7 @@
<item>
<widget class="QLabel" name="password_label_2">
<property name="toolTip">
<string>This Password is for PGP</string>
<string>This password is for PGP</string>
</property>
<property name="text">
<string>Password (check)</string>
@ -234,16 +234,16 @@
</widget>
</item>
<item>
<widget class="QLabel" name="location_label">
<widget class="QLabel" name="node_label">
<property name="text">
<string>Location</string>
<string>Node</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="hiddenaddr_label">
<property name="text">
<string>Tor Address</string>
<string>TOR address</string>
</property>
</widget>
</item>
@ -313,7 +313,7 @@ anonymous, you can use a fake email.</string>
</widget>
</item>
<item>
<widget class="QLineEdit" name="location_input">
<widget class="QLineEdit" name="node_input">
<property name="maxLength">
<number>64</number>
</property>
@ -462,22 +462,22 @@ anonymous, you can use a fake email.</string>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>genPGPuser</tabstop>
<tabstop>name_input</tabstop>
<tabstop>email_input</tabstop>
<tabstop>password_input</tabstop>
<tabstop>password_input_2</tabstop>
<tabstop>location_input</tabstop>
<tabstop>hiddenaddr_input</tabstop>
<tabstop>hiddenport_spinBox</tabstop>
<tabstop>genButton</tabstop>
<tabstop>new_gpg_key_checkbox</tabstop>
<tabstop>hidden_checkbox</tabstop>
<tabstop>importIdentity_PB</tabstop>
<tabstop>exportIdentity_PB</tabstop>
</tabstops>
<resources>
<include location="images.qrc"/>
<tabstop>genPGPuser</tabstop>
<tabstop>name_input</tabstop>
<tabstop>email_input</tabstop>
<tabstop>password_input</tabstop>
<tabstop>password_input_2</tabstop>
<tabstop>node_input</tabstop>
<tabstop>hiddenaddr_input</tabstop>
<tabstop>hiddenport_spinBox</tabstop>
<tabstop>genButton</tabstop>
<tabstop>new_gpg_key_checkbox</tabstop>
<tabstop>hidden_checkbox</tabstop>
<tabstop>importIdentity_PB</tabstop>
<tabstop>exportIdentity_PB</tabstop>
</tabstops>
<resources>
<include location="images.qrc"/>
</resources>
<connections/>
</ui>

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

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

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

@ -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
}

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

@ -286,7 +286,7 @@ The current identities/locations will not be affected.</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Manage profiles and locations...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Manage profiles and nodes...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>

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

@ -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();
}

10
retroshare-gui/src/gui/common/FriendList.cpp
View File

@ -358,7 +358,7 @@ void FriendList::peerTreeWidgetCostumPopupMenu()
break;
case TYPE_SSL:
//this is a SSL key
textLabel->setText("<strong>" + tr("Location") + "</strong>");
textLabel->setText("<strong>" + tr("Node") + "</strong>");
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<RsPgpId>::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<RsPeerId> 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 */

4
retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
View File

@ -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<RsPeerId> 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;
}
}

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

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

8
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -597,14 +597,14 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="fr_locationLabel">
<widget class="QLabel" name="fr_nodeLabel">
<property name="text">
<string>Location:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="fr_locationEdit">
<widget class="QLabel" name="fr_nodeEdit">
<property name="text">
<string notr="true">Location</string>
</property>
@ -901,14 +901,14 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="locationLabel">
<widget class="QLabel" name="nodeLabel">
<property name="text">
<string>Location:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="locationEdit">
<widget class="QLabel" name="nodeEdit">
<property name="text">
<string notr="true">Location</string>
</property>

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

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

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

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

2
retroshare-gui/src/gui/profile/ProfileManager.cpp
View File

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

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

@ -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()));
}

4
retroshare-gui/src/gui/settings/CryptoPage.ui
View File

@ -482,9 +482,9 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="createNewLocation_PB">
<widget class="QPushButton" name="createNewNode_PB">
<property name="text">
<string>Create new location...</string>
<string>Create new node...</string>
</property>
</widget>
</item>

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

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

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

@ -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

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

@ -725,12 +725,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>ChatDialog</name>
<message>
<source>Your friend has more than one locations.
Please choose one of it to chat with.</source>
<source>Talking to </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Talking to </source>
<source>Your friend has more than one nodes.
Please choose one of it to chat with.</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -2123,10 +2123,6 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
<source>Abnormal size read is bigger than memory block.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid location id.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid external IP.</source>
<translation type="unfinished"></translation>
@ -2366,6 +2362,10 @@ even if you don&apos;t make friends.</source>
<source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid node id.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ConnectProgressDialog</name>
@ -2657,10 +2657,6 @@ even if you don&apos;t make friends.</source>
<source>Please contact them to add your Full Certificate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>They need a Certificate + Location for UDP connections to succeed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>We Cannot find your Friend.</source>
<translation type="unfinished"></translation>
@ -2745,6 +2741,10 @@ p, li { white-space: pre-wrap; }
<source>Retroshare cannot connect without this information</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>They need a Certificate + Node for UDP connections to succeed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateCircleDialog</name>
@ -3259,11 +3259,11 @@ Do you want to reject this message?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create new location...</source>
<source>Node</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Node</source>
<source>Create new node...</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -4229,10 +4229,6 @@ you plug it in.</source>
<source>Friend</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Message Group</source>
<translation type="unfinished"></translation>
@ -4269,10 +4265,6 @@ you plug it in.</source>
<source>Deny Friend</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove Friend Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add to group</source>
<translation type="unfinished"></translation>
@ -4345,6 +4337,14 @@ you plug it in.</source>
<source>Sort by</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Node</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Remove Friend Node</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FriendRequestToaster</name>
@ -4394,38 +4394,6 @@ you plug it in.</source>
<source>Broadcast</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bold</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Underline</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Italic</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Font</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Text Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Attach File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Send</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Messages entered here are sent to all connected friends</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear Chat History</source>
<translation type="unfinished"></translation>
@ -4486,34 +4454,6 @@ you plug it in.</source>
<source>Reset font to default</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Paste RetroShare Link</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is typing...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New group chat</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do you really want to physically delete the history?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add Extra File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save as...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Text File (*.txt );;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Keyring</source>
<translation type="unfinished"></translation>
@ -4522,14 +4462,6 @@ you plug it in.</source>
<source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Attach a Picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Picture File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Network</source>
<translation type="unfinished"></translation>
@ -4553,10 +4485,6 @@ you plug it in.</source>
<source>Create new Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<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>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>
@ -4583,10 +4511,6 @@ 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>Password</source>
<translation type="unfinished"></translation>
@ -4595,10 +4519,6 @@ anonymous, you can use a fake email.</source>
<source>Put a strong password here. This password protects your PGP key.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create new identity</source>
<translation type="unfinished"></translation>
@ -4647,18 +4567,6 @@ anonymous, you can use a fake email.</source>
<source>[Required] This password protects your PGP key.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create new Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate new Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create a new Location</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create new Identity</source>
<translation type="unfinished"></translation>
@ -4671,18 +4579,6 @@ anonymous, you can use a fake email.</source>
<source>You can create a new identity with this form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can use an existing identity (i.e. a PGP key pair), from the list below, or create a new one with this form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Export Identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RetroShare Identity files (*.asc)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Identity saved</source>
<translation type="unfinished"></translation>
@ -4719,18 +4615,6 @@ and use the import button to load it</source>
<source>Your identity was imported successfully:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can use it now to create a new location.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate PGP key Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Location field is required with a minimum of 3 characters</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>All fields are required with a minimum of 3 characters</source>
<translation type="unfinished"></translation>
@ -4741,14 +4625,6 @@ and use the import button to load it</source>
Fill in your PGP password when asked, to sign your new key.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate ID Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to Generate your new Certificate, maybe PGP password is wrong!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Password (check)</source>
<translation type="unfinished"></translation>
@ -4761,24 +4637,10 @@ Fill in your PGP password when asked, to sign your new key.</source>
<source>[Required] Type the same password again here.</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>Passwords do not match</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create a Hidden Location.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tor Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Port</source>
<translation type="unfinished"></translation>
@ -4788,11 +4650,89 @@ the same identity (PGP key).</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid Hidden Location</source>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Please put in a valid address of the form: 31769173498.onion:7800</source>
<source>Create a hidden node.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This password is for PGP</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Node</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>TOR address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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).</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create new node</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate new node</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Create a new node</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Alternatively you can use an existing identity. Just uncheck &quot;Create a new identity&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate new identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Export identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RetroShare identity files (*.asc)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can use it now to create a new node.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid hidden node</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Please enter a valid address of the form: 31769173498.onion:7800</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate PGP key failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Node field is required with a minimum of 3 characters</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Generate ID failure</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to generate your new certificate, maybe PGP password is wrong!</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -8768,7 +8708,7 @@ Right-click and select &apos;make friend&apos; to be able to connect.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Export/create a new location</source>
<source>Export/create a new node</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -10061,10 +10001,6 @@ and use the import button to load it</source>
<source>Your identity was imported successfully:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can use it now to create a new location.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select Trusted Friend</source>
<translation type="unfinished"></translation>
@ -10093,6 +10029,10 @@ p, li { white-space: pre-wrap; }
<source>Export selected key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You can use it now to create a new node.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProfileWidget</name>
@ -10437,14 +10377,6 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You appear to have locations associated to DSA keys:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DSA keys are not yet supported by this version of RetroShare. All these locations will be unusable. We&apos;re very sorry for that.</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>
@ -10572,6 +10504,14 @@ Reported error is:
<source>Data forward</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You appear to have nodes associated to DSA keys:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>DSA keys are not yet supported by this version of RetroShare. All these nodes will be unusable. We&apos;re very sorry for that.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QuickStartWizard</name>
@ -11562,11 +11502,11 @@ Reducing image to %1x%2 pixels?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Peer/location not in friendlist (PGP id=</source>
<source>Send Message</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Send Message</source>
<source>Peer/node not in friendlist (PGP id=</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -12296,14 +12236,6 @@ adding locations to an existing profile.
The current identities/locations will not be affected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Manage profiles and locations...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Person Failure</source>
<translation type="unfinished"></translation>
@ -12317,7 +12249,15 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<source>The password to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring.
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Manage profiles and nodes...&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The password to your SSL certificate (your location) will be stored encrypted in your Keychain.
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The password to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure.
<source>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.

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

@ -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 += "<UL>" ;
for(std::map<std::string,std::vector<std::string> >::const_iterator it(unsupported_keys.begin());it!=unsupported_keys.end();++it)
{
@ -89,7 +89,7 @@ static void displayWarningAboutDSAKeys()
txt += "</UL>" ;
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"));