diff --git a/build_scripts/Debian+Ubuntu/changelog b/build_scripts/Debian+Ubuntu/changelog index 70bbeb0e0..a84fe88b6 100644 --- a/build_scripts/Debian+Ubuntu/changelog +++ b/build_scripts/Debian+Ubuntu/changelog @@ -1851,7 +1851,7 @@ retroshare (0.5.4-0.6685~precise) precise; urgency=low * Bug fixes - - Added missing location from cert when addign new friend + - Added missing location from cert when adding new friend - Added missing IndicateConfigChanged to p3PeerMgrIMPL::setDynDNS - Fixed crash when closing the main window without the setting "Minimize to Tray Icon" - Renamed the setting "Do not Minimize to Tray Icon" to "Minimize to Tray @@ -2925,7 +2925,7 @@ retroshare (0.5.3-0.4953~natty) natty; urgency=low - Fixed Download toaster (utf8 in file name, use QDesktopServices vs RsUrlHandler for collections, fixed crash after opening a collection) (Patch from AsamK). - fixed utf8 chars in certificate links (Patch from AsamK) - - removed cache adding strategy to DL queue that was O(n^2). Now addign cache at the end of the queue + - removed cache adding strategy to DL queue that was O(n^2). Now adding cache at the end of the queue - Fixed bug when the user clicks on a link without http:// in a QTextBrowser. This link was oppened directly in RetroShare. - Attempted fix for maintaining External Port in Manual Forwarded Mode. diff --git a/libretroshare/src/chat/distributedchat.cc b/libretroshare/src/chat/distributedchat.cc index 72a3f2a93..d0fdaab0b 100644 --- a/libretroshare/src/chat/distributedchat.cc +++ b/libretroshare/src/chat/distributedchat.cc @@ -1288,7 +1288,7 @@ void DistributedChatService::handleRecvLobbyInvite(RsChatLobbyInviteItem *item) else std::cerr << " : Match!" << std::endl; - std::cerr << " Addign new friend " << item->PeerId() << " to lobby." << std::endl; + std::cerr << " Adding new friend " << item->PeerId() << " to lobby." << std::endl; #endif it->second.participating_friends.insert(item->PeerId()) ; diff --git a/retroshare-gui/src/changelog.txt b/retroshare-gui/src/changelog.txt index c535d3a42..3da31f03c 100644 --- a/retroshare-gui/src/changelog.txt +++ b/retroshare-gui/src/changelog.txt @@ -364,7 +364,7 @@ Changes for 0.5.5a * Bug fixes - Fixed proper display of crypto params for UDP connections - - Added missing location from cert when addign new friend + - Added missing location from cert when adding new friend - Added missing IndicateConfigChanged to p3PeerMgrIMPL::setDynDNS - Fixed crash when closing the main window without the setting "Minimize to Tray Icon" - Renamed the setting "Do not Minimize to Tray Icon" to "Minimize to Tray @@ -1189,7 +1189,7 @@ Changes for v0.5.3b - Added BSD specific changes - data directory and #including - improved plugin management to allow services to be used, and config pages to be added - Improvement to plugin system: - - made config page system more automatic, to allow addign config pages from plugins + - made config page system more automatic, to allow adding config pages from plugins - added (disabled) checkbox and function to allow all plugins for development - added config page methods to RsPlugin class - Mark local existing files in SearchDialog with red text color. @@ -1202,7 +1202,7 @@ Changes for v0.5.3b - Added Cache system for GPG Certificates. - This should reduce gpg calls by 90+%. - Added translation for "[ ... Missing Message ... ]". - - removed cache adding strategy to DL queue that was O(n^2). Now addign cache at the end of the queue + - removed cache adding strategy to DL queue that was O(n^2). Now adding cache at the end of the queue - The channel message (in channels) is set to read when the user clicks on the show more button. - The forum/channel news feed is removed when the user reads the message in forums/channels. - The standard font is now used for new chat lobbies. diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index e3b975843..3efd0c23d 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -401,7 +401,7 @@ void MainWindow::initStackedPage() else icon = QIcon(":images/extension_48.png") ; - std::cerr << " Addign widget page for plugin " << rsPlugins->plugin(i)->getPluginName() << std::endl; + std::cerr << " Adding widget page for plugin " << rsPlugins->plugin(i)->getPluginName() << std::endl; pluginPage->setIconPixmap(icon); pluginPage->setPageName(QString::fromUtf8(rsPlugins->plugin(i)->getPluginName().c_str())); addPage(pluginPage, grp, ¬ify); diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index 6c64a7b89..fddb96ee3 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -1341,7 +1341,7 @@ void FlatStyle_RDM::updateRefs() if(details->type == DIR_TYPE_FILE) // only push files, not directories nor persons. _ref_entries.push_back(std::pair(ref,computeDirectoryPath(*details))); #ifdef RDM_DEBUG - std::cerr << "FlatStyle_RDM::postMods(): addign ref " << ref << std::endl; + std::cerr << "FlatStyle_RDM::postMods(): adding ref " << ref << std::endl; #endif for(std::list::const_iterator it = details->children.begin(); it != details->children.end(); ++it) _ref_stack.push_back(it->ref) ; diff --git a/retroshare-gui/src/gui/common/GroupSelectionBox.cpp b/retroshare-gui/src/gui/common/GroupSelectionBox.cpp index 55317115d..613459019 100644 --- a/retroshare-gui/src/gui/common/GroupSelectionBox.cpp +++ b/retroshare-gui/src/gui/common/GroupSelectionBox.cpp @@ -46,7 +46,7 @@ void GroupSelectionBox::selectedGroupIds(std::list &groupIds) const QListWidgetItem *listItem = item(i); if (listItem->checkState() == Qt::Checked) { groupIds.push_back(item(i)->data(ROLE_ID).toString().toStdString()); - std::cerr << "Addign selected item " << groupIds.back() << std::endl; + std::cerr << "Adding selected item " << groupIds.back() << std::endl; } } } @@ -74,7 +74,7 @@ void GroupSelectionBox::selectedGroupNames(QList &groupNames) const QListWidgetItem *listItem = item(i); if (listItem->checkState() == Qt::Checked) { groupNames.push_back(item(i)->text()); - std::cerr << "Addign selected item " << groupNames.back().toUtf8().constData() << std::endl; + std::cerr << "Adding selected item " << groupNames.back().toUtf8().constData() << std::endl; } } }